Hello community,
here is the log from the commit of package kernel-source
checked in at Tue Oct 14 18:15:49 CEST 2008.
--------
--- kernel-source/kernel-debug.changes 2008-10-13 22:07:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-10-14 16:03:24.726695000 +0200
@@ -1,0 +2,110 @@
+Tue Oct 14 15:48:20 CEST 2008 - mmarek@suse.cz
+
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+
+-------------------------------------------------------------------
+Tue Oct 14 15:45:52 CEST 2008 - jkosina@suse.de
+
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+
+-------------------------------------------------------------------
+Tue Oct 14 15:16:38 CEST 2008 - jeffm@suse.de
+
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+
+-------------------------------------------------------------------
+Tue Oct 14 14:04:11 CEST 2008 - npiggin@suse.de
+
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+
+-------------------------------------------------------------------
+Tue Oct 14 13:19:29 CEST 2008 - sjayaraman@suse.de
+
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+
+-------------------------------------------------------------------
+Tue Oct 14 10:54:40 CEST 2008 - jbeulich@novell.com
+
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+
+-------------------------------------------------------------------
+Tue Oct 14 10:27:19 CEST 2008 - ptesarik@suse.cz
+
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+
+-------------------------------------------------------------------
+Tue Oct 14 10:09:32 CEST 2008 - jbeulich@novell.com
+
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+
+-------------------------------------------------------------------
+Tue Oct 14 10:08:27 CEST 2008 - olh@suse.de
+
+- call bootloader_entry without leading /boot/ (bnc#435104)
+
+-------------------------------------------------------------------
+Tue Oct 14 09:44:43 CEST 2008 - mmarek@suse.cz
+
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+
+-------------------------------------------------------------------
+Tue Oct 14 09:44:42 CEST 2008 - olh@suse.de
+
+- disable unused ide_platform driver
+
+-------------------------------------------------------------------
+Tue Oct 14 09:04:59 CEST 2008 - jdelvare@suse.de
+
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+
+-------------------------------------------------------------------
+Tue Oct 14 06:27:23 CEST 2008 - gregkh@suse.de
+
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+
+-------------------------------------------------------------------
+Tue Oct 14 00:59:55 CEST 2008 - gregkh@suse.de
+
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+
+-------------------------------------------------------------------
+Tue Oct 14 00:30:29 CEST 2008 - gregkh@suse.de
+
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+
+-------------------------------------------------------------------
+Tue Oct 14 00:22:11 CEST 2008 - gregkh@suse.de
+
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+
+-------------------------------------------------------------------
+Tue Oct 14 00:13:30 CEST 2008 - gregkh@suse.de
+
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+
+-------------------------------------------------------------------
+Mon Oct 13 23:44:42 CEST 2008 - gregkh@suse.de
+
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-rt.changes: same change
kernel-rt_debug.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-source-rt.changes: same change
kernel-syms.changes: same change
kernel-syms-rt.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
Old:
----
functions.sh
New:
----
preun.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:46.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:46.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -139,10 +139,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -197,6 +197,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -215,7 +219,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -433,25 +437,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:debug:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:debug:g" \
-e "s:@SUBPACKAGE@:kernel-debug$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:debug:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-debug
%endif
@@ -658,9 +663,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -689,11 +698,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-debug-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-debug-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-debug-base -f kernel-base.files
@@ -720,15 +733,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-debug-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-debug-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:46.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:46.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -158,10 +158,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -216,6 +216,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -233,7 +237,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -451,25 +455,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:default:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:default:g" \
-e "s:@SUBPACKAGE@:kernel-default$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:default:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-default
%endif
@@ -676,9 +681,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -706,11 +715,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-default-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-default-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-default-base -f kernel-base.files
@@ -736,15 +749,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-default-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-default-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:46.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:46.000000000 +0200
@@ -23,7 +23,7 @@
Name: kernel-dummy
Summary: Internal dummy package for synchronizing release numbers
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
AutoReqProv: off
@@ -36,7 +36,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%install
rm -rf %buildroot
@@ -47,6 +47,62 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:46.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:46.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -136,10 +136,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -194,6 +194,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -214,7 +218,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -432,25 +436,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:kdump:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:kdump:g" \
-e "s:@SUBPACKAGE@:kernel-kdump$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:kdump:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-kdump
%endif
@@ -657,9 +662,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -690,11 +699,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-kdump-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-kdump-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-kdump-base -f kernel-base.files
@@ -723,15 +736,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-kdump-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-kdump-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:47.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -133,10 +133,10 @@
Provides: k_smp4G kernel-bigsmp
Obsoletes: k_smp4G kernel-bigsmp
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -191,6 +191,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -215,7 +219,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -433,25 +437,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:pae:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:pae:g" \
-e "s:@SUBPACKAGE@:kernel-pae$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:pae:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-pae
%endif
@@ -658,9 +663,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -695,11 +704,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-pae-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-pae-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-pae-base -f kernel-base.files
@@ -732,15 +745,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-pae-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-pae-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:47.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -138,10 +138,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -196,6 +196,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -227,7 +231,7 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -445,25 +449,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:ppc64:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:ppc64:g" \
-e "s:@SUBPACKAGE@:kernel-ppc64$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:ppc64:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-ppc64
%endif
@@ -670,9 +675,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -714,11 +723,15 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-ppc64-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-ppc64-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-ppc64-base -f kernel-base.files
@@ -758,15 +771,77 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-ppc64-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-ppc64-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:47.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -136,10 +136,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -194,6 +194,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -213,7 +217,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -431,25 +435,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:ps3:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:ps3:g" \
-e "s:@SUBPACKAGE@:kernel-ps3$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:ps3:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-ps3
%endif
@@ -656,9 +661,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -686,11 +695,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-ps3-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-ps3-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-ps3-base -f kernel-base.files
@@ -716,15 +729,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-ps3-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-ps3-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-rt_debug.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:47.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:47.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-rt_debug
Summary: A Debug Version of the Kernel
Version: 2.6.27
-Release: 4
+Release: 5
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -136,10 +136,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -194,6 +194,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -212,7 +216,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -430,25 +434,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:rt_debug:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:rt_debug:g" \
-e "s:@SUBPACKAGE@:kernel-rt_debug$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:rt_debug:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-rt_debug
%endif
@@ -655,9 +660,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -686,11 +695,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-rt_debug-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-rt_debug-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-rt_debug-base -f kernel-base.files
@@ -717,15 +730,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-rt_debug-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-rt_debug-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-rt.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:48.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:48.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-rt
Summary: The Realtime Linux Kernel
Version: 2.6.27
-Release: 5
+Release: 6
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -136,10 +136,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -194,6 +194,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -217,7 +221,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -435,25 +439,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:rt:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:rt:g" \
-e "s:@SUBPACKAGE@:kernel-rt$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:rt:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-rt
%endif
@@ -660,9 +665,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -696,11 +705,15 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-rt-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-rt-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-rt-base -f kernel-base.files
@@ -732,15 +745,77 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-rt-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-rt-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:48.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:48.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -133,10 +133,10 @@
Provides: kernel-32bit k_deflt
Obsoletes: kernel-32bit k_deflt
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -191,6 +191,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -208,7 +212,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -426,25 +430,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:s390:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:s390:g" \
-e "s:@SUBPACKAGE@:kernel-s390$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:s390:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-s390
%endif
@@ -651,9 +656,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -681,11 +690,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-s390-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-s390-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-s390-base -f kernel-base.files
@@ -711,15 +724,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-s390-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-s390-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-source-rt.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:48.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:48.000000000 +0200
@@ -30,7 +30,7 @@
Name: kernel-source-rt
Summary: The Linux Kernel Sources, including the real-time patches
Version: 2.6.27
-Release: 11
+Release: 12
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
@@ -48,15 +48,15 @@
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
-Source2: source-post.sh
-Source3: kernel-source-rt.rpmlintrc
-Source10: pre.sh
-Source11: post.sh
-Source12: postun.sh
-Source13: series.conf
-Source14: arch-symbols
-Source15: guards
+Source1: source-post.sh
+Source2: kernel-source-rt.rpmlintrc
+Source10: preun.sh
+Source11: postun.sh
+Source12: pre.sh
+Source13: post.sh
+Source14: series.conf
+Source15: arch-symbols
+Source16: guards
Source21: config.conf
Source23: supported.conf
Source30: config-subst
@@ -120,7 +120,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -276,16 +276,70 @@
install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm
install -m 644 %_sourcedir/kernel-module-subpackage \
$RPM_BUILD_ROOT/usr/lib/rpm/
-( cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@VARIANT@:$variant:g" \
- %_sourcedir/source-post.sh
-) > kernel-source-rt-post.sh
+ %_sourcedir/source-post.sh > kernel-source-rt-post.sh
%post -f kernel-source-rt-post.sh
%files -f kernel-source-rt.files
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:49.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:49.000000000 +0200
@@ -30,7 +30,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
@@ -48,15 +48,15 @@
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
-Source2: source-post.sh
-Source3: kernel-source.rpmlintrc
-Source10: pre.sh
-Source11: post.sh
-Source12: postun.sh
-Source13: series.conf
-Source14: arch-symbols
-Source15: guards
+Source1: source-post.sh
+Source2: kernel-source.rpmlintrc
+Source10: preun.sh
+Source11: postun.sh
+Source12: pre.sh
+Source13: post.sh
+Source14: series.conf
+Source15: arch-symbols
+Source16: guards
Source21: config.conf
Source23: supported.conf
Source30: config-subst
@@ -120,7 +120,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -276,16 +276,70 @@
install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm
install -m 644 %_sourcedir/kernel-module-subpackage \
$RPM_BUILD_ROOT/usr/lib/rpm/
-( cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@VARIANT@:$variant:g" \
- %_sourcedir/source-post.sh
-) > kernel-source-post.sh
+ %_sourcedir/source-post.sh > kernel-source-post.sh
%post -f kernel-source-post.sh
%files -f kernel-source.files
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-syms-rt.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:49.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:49.000000000 +0200
@@ -29,7 +29,7 @@
Name: kernel-syms-rt
Summary: Kernel Symbol Versions (modversions) For Real-Time Kernels
Version: 2.6.27
-Release: 5
+Release: 6
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
@@ -74,7 +74,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
echo "Architecture symbol(s):" %symbols
@@ -130,6 +130,62 @@
/boot/symsets-*-*.tar.gz
/lib/modules/*/build
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:49.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:49.000000000 +0200
@@ -29,7 +29,7 @@
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
@@ -94,7 +94,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
echo "Architecture symbol(s):" %symbols
@@ -150,6 +150,62 @@
/boot/symsets-*-*.tar.gz
/lib/modules/*/build
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:49.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:49.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.27
-Release: 11
+Release: 12
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -139,10 +139,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -197,6 +197,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -220,7 +224,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -438,25 +442,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:trace:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:trace:g" \
-e "s:@SUBPACKAGE@:kernel-trace$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:trace:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-trace
%endif
@@ -663,9 +668,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -697,11 +706,15 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-trace-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-trace-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-trace-base -f kernel-base.files
@@ -731,15 +744,77 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-trace-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-trace-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:50.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:50.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.27
-Release: 18
+Release: 19
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -155,10 +155,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -213,6 +213,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -230,7 +234,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -448,25 +452,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:vanilla:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:vanilla:g" \
-e "s:@SUBPACKAGE@:kernel-vanilla$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:vanilla:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-vanilla
%endif
@@ -673,9 +678,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -701,11 +710,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-vanilla-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-vanilla-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-vanilla-base -f kernel-base.files
@@ -729,15 +742,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-vanilla-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-vanilla-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.l23846/_old 2008-10-14 18:06:50.000000000 +0200
+++ /var/tmp/diff_new_pack.l23846/_new 2008-10-14 18:06:50.000000000 +0200
@@ -58,7 +58,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.27
-Release: 16
+Release: 17
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
@@ -136,10 +136,10 @@
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
-Source1: functions.sh
+Source10: preun.sh
Source11: postun.sh
-Source12: post.sh
-Source13: pre.sh
+Source12: pre.sh
+Source13: post.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -194,6 +194,10 @@
Obsoletes: uvcvideo-kmp
Obsoletes: atl2-kmp
Obsoletes: wlan-ng-kmp
+Obsoletes: et131x-kmp
+Obsoletes: ivtv-kmp
+Obsoletes: at76_usb-kmp
+Obsoletes: pcc-acpi-kmp
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
@@ -214,7 +218,7 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
%prep
if ! [ -e %_sourcedir/linux-2.6.27.tar.bz2 ]; then
@@ -432,25 +436,26 @@
%endif
# end of build_kdump
%endif
-sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:xen:g" \
- %_sourcedir/pre.sh > ../pre-base.sh
for sub in '-base' '' '-extra'; do
- { cat %_sourcedir/functions.sh
+%if %split_packages
+ if [ "x$sub" = "x-base" ]; then
+ base_package=1
+ else
+ base_package=0
+ fi
+%else
+ base_package=1
+%endif
+ for script in preun postun pre post; do
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:xen:g" \
-e "s:@SUBPACKAGE@:kernel-xen$sub:g" \
- %_sourcedir/post.sh
- } > ../post$sub.sh
+ -e "s:@BASE_PACKAGE@:$base_package:g" \
+ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
+ %_sourcedir/$script.sh > ../$script$sub.sh
+ done
done
-{ cat %_sourcedir/functions.sh
- sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
- -e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:xen:g" \
- %_sourcedir/postun.sh
-} > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
suffix=-xen
%endif
@@ -657,9 +662,13 @@
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
-%post -f post.sh
+%preun -f preun.sh
%postun -f postun.sh
+
+%pre -f pre.sh
+
+%post -f post.sh
%if %split_packages
%files -f kernel-main.files
@@ -690,11 +699,15 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun base -f preun-base.sh
-%pre -n kernel-xen-base -f pre-base.sh
+%postun base -f postun-base.sh
-%post -n kernel-xen-base -f post-base.sh
+%pre base -f pre-base.sh
+
+%post base -f post-base.sh
%if %split_packages
%files -n kernel-xen-base -f kernel-base.files
@@ -723,15 +736,77 @@
-Source Timestamp: 2008-10-13 21:37:58 +0200
+Source Timestamp: 2008-10-14 16:02:55 +0200
+
+%preun extra -f preun-extra.sh
+
+%postun extra -f postun-extra.sh
-%post -n kernel-xen-extra -f post-extra.sh
+%pre extra -f pre-extra.sh
+
+%post extra -f post-extra.sh
%if %split_packages
%files -n kernel-xen-extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%changelog
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/postun.sh, rpm/post.sh: temporarily ignore errors from
+ weak-modules2 --{add,remove}-kernel-modules until
+ module-init-tools has rebuilt
+* Tue Oct 14 2008 jkosina@suse.de
+- patches.fixes/input-add-amilo-pro-v-to-nomux.patch: Delete.
+ The patch is already upstream in 2.6.27
+* Tue Oct 14 2008 jeffm@suse.de
+- patches.suse/osync-error: Update position after check for -EIO
+ (bnc#434910).
+* Tue Oct 14 2008 npiggin@suse.de
+- patches.suse/rlimit-memlock-64k.patch: Increase default
+ RLIMIT_MEMLOCK to 64k (bnc#329675).
+* Tue Oct 14 2008 sjayaraman@suse.de
+- Update config files: CIFS_EXPERIMENTAL=y and CIFS_DFS_UPCALL=y
+ (FATE#303758).
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.xen/xen-irq-probe: restrict IRQ probing (bnc#431572).
+* Tue Oct 14 2008 ptesarik@suse.cz
+- patches.trace/utrace-core: undo overzealous #ifdef's, which
+ removed too much code in case UTRACE_CONFIG was unset.
+* Tue Oct 14 2008 jbeulich@novell.com
+- patches.fixes/reiserfs-commit-ids-unsigned-ints: Remove L suffix
+ from constant compared against.
+* Tue Oct 14 2008 olh@suse.de
+- call bootloader_entry without leading /boot/ (bnc#435104)
+* Tue Oct 14 2008 mmarek@suse.cz
+- rpm/kernel-source.spec.in, rpm/source-post.sh, rpm/functions.sh:
+ kill functions.sh, put the relink() function to source-post.sh
+ directly
+- rpm/postun.sh, rpm/pre.sh, rpm/preun.sh, rpm/post.sh,
+ rpm/kernel-binary.spec.in: unify generation of the scriptlets,
+ switch to the new weak-modules2 script
+* Tue Oct 14 2008 olh@suse.de
+- disable unused ide_platform driver
+* Tue Oct 14 2008 jdelvare@suse.de
+- supported.conf: Remove i2c-core and i2c-piix4 from base.
+* Tue Oct 14 2008 gregkh@suse.de
+- supported.conf: remove ide-core and ide-cdrom from base on request
+ from Tejun.
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-add-pcc-acpi-driver.patch: Staging:
+ add pcc-acpi driver.
+- rpm/kernel-binary.spec.in: Obsoletes pcc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: it's pcc-acpi and it's not obsolete, yet.
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes at76_usb-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- rpm/kernel-binary.spec.in: obsoletes et131x-kmp, ivtv-kmp, and
+ ppc-acpi-kmp
+* Tue Oct 14 2008 gregkh@suse.de
+- Update config files.
+- patches.drivers/staging-at76_usb-wireless-driver.patch: staging:
+ at76_usb wireless driver.
* Mon Oct 13 2008 gregkh@suse.de
- refresh all patches (except xen and rt) to apply cleanly
* Mon Oct 13 2008 gregkh@suse.de
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2008-10-13 22:07:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2008-10-14 16:03:21.458986000 +0200
@@ -1 +1 @@
-2008-10-13 21:37:58 +0200
+2008-10-14 16:02:55 +0200
++++++ config.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2008-10-13 21:36:51.000000000 +0200
+++ new/config/i386/debug 2008-10-14 15:54:47.000000000 +0200
@@ -3775,6 +3775,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3970,7 +3972,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default
--- old/config/i386/default 2008-10-13 21:36:51.000000000 +0200
+++ new/config/i386/default 2008-10-14 15:54:47.000000000 +0200
@@ -3780,6 +3780,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3975,7 +3977,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2008-10-13 21:36:51.000000000 +0200
+++ new/config/i386/pae 2008-10-14 15:54:47.000000000 +0200
@@ -3768,6 +3768,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3963,7 +3965,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/trace new/config/i386/trace
--- old/config/i386/trace 2008-10-13 21:36:51.000000000 +0200
+++ new/config/i386/trace 2008-10-14 15:54:48.000000000 +0200
@@ -3780,6 +3780,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3975,7 +3977,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2008-10-13 21:36:51.000000000 +0200
+++ new/config/i386/xen 2008-10-14 15:54:48.000000000 +0200
@@ -3528,6 +3528,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3721,7 +3723,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug
--- old/config/ia64/debug 2008-10-13 21:36:51.000000000 +0200
+++ new/config/ia64/debug 2008-10-14 15:54:48.000000000 +0200
@@ -3232,7 +3232,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2008-10-13 21:36:51.000000000 +0200
+++ new/config/ia64/default 2008-10-14 15:54:48.000000000 +0200
@@ -3230,7 +3230,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/trace new/config/ia64/trace
--- old/config/ia64/trace 2008-10-13 21:36:51.000000000 +0200
+++ new/config/ia64/trace 2008-10-14 15:54:48.000000000 +0200
@@ -3230,7 +3230,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default
--- old/config/powerpc/default 2008-10-13 21:36:51.000000000 +0200
+++ new/config/powerpc/default 2008-10-14 15:54:48.000000000 +0200
@@ -948,7 +948,7 @@
#
# IDE chipset support/bugfixes
#
-CONFIG_BLK_DEV_PLATFORM=m
+# CONFIG_BLK_DEV_PLATFORM is not set
CONFIG_BLK_DEV_IDEDMA_SFF=y
#
@@ -2947,7 +2947,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump
--- old/config/powerpc/kdump 2008-10-13 21:36:51.000000000 +0200
+++ new/config/powerpc/kdump 2008-10-14 15:54:48.000000000 +0200
@@ -815,7 +815,7 @@
#
# IDE chipset support/bugfixes
#
-CONFIG_BLK_DEV_PLATFORM=m
+# CONFIG_BLK_DEV_PLATFORM is not set
#
# PCI IDE chipsets support
@@ -2398,7 +2398,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64
--- old/config/powerpc/ppc64 2008-10-13 21:36:51.000000000 +0200
+++ new/config/powerpc/ppc64 2008-10-14 15:54:48.000000000 +0200
@@ -971,7 +971,7 @@
#
# IDE chipset support/bugfixes
#
-CONFIG_BLK_DEV_PLATFORM=m
+# CONFIG_BLK_DEV_PLATFORM is not set
CONFIG_BLK_DEV_IDEDMA_SFF=y
#
@@ -2887,7 +2887,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/rt new/config/powerpc/rt
--- old/config/powerpc/rt 2008-10-13 21:36:51.000000000 +0200
+++ new/config/powerpc/rt 2008-10-14 15:54:48.000000000 +0200
@@ -952,7 +952,6 @@
#
# IDE chipset support/bugfixes
#
-CONFIG_BLK_DEV_PLATFORM=m
CONFIG_BLK_DEV_IDEDMA_SFF=y
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/vanilla new/config/powerpc/vanilla
--- old/config/powerpc/vanilla 2008-10-09 23:09:10.000000000 +0200
+++ new/config/powerpc/vanilla 2008-10-14 15:54:48.000000000 +0200
@@ -960,7 +960,7 @@
#
# IDE chipset support/bugfixes
#
-CONFIG_BLK_DEV_PLATFORM=m
+# CONFIG_BLK_DEV_PLATFORM is not set
CONFIG_BLK_DEV_IDEDMA_SFF=y
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default
--- old/config/s390/default 2008-10-13 21:36:51.000000000 +0200
+++ new/config/s390/default 2008-10-14 15:54:48.000000000 +0200
@@ -1030,7 +1030,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_NCP_FS is not set
CONFIG_CODA_FS=m
CONFIG_AFS_FS=m
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390
--- old/config/s390/s390 2008-10-13 21:36:51.000000000 +0200
+++ new/config/s390/s390 2008-10-14 15:54:48.000000000 +0200
@@ -1023,7 +1023,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
# CONFIG_NCP_FS is not set
CONFIG_CODA_FS=m
CONFIG_AFS_FS=m
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug
--- old/config/x86_64/debug 2008-10-13 21:36:51.000000000 +0200
+++ new/config/x86_64/debug 2008-10-14 15:54:48.000000000 +0200
@@ -3497,6 +3497,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3693,7 +3695,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2008-10-13 21:36:51.000000000 +0200
+++ new/config/x86_64/default 2008-10-14 15:54:48.000000000 +0200
@@ -3505,6 +3505,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3701,7 +3703,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/trace new/config/x86_64/trace
--- old/config/x86_64/trace 2008-10-13 21:36:51.000000000 +0200
+++ new/config/x86_64/trace 2008-10-14 15:54:49.000000000 +0200
@@ -3505,6 +3505,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3701,7 +3703,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2008-10-13 21:36:51.000000000 +0200
+++ new/config/x86_64/xen 2008-10-14 15:54:49.000000000 +0200
@@ -3444,6 +3444,8 @@
CONFIG_W35UND=m
CONFIG_PRISM2_USB=m
CONFIG_ECHO=m
+CONFIG_USB_ATMEL=m
+CONFIG_PCC_ACPI=m
#
# Firmware Drivers
@@ -3637,7 +3639,8 @@
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+CONFIG_CIFS_DFS_UPCALL=y
CONFIG_NCP_FS=m
CONFIG_NCPFS_PACKET_SIGNING=y
CONFIG_NCPFS_IOCTL_LOCKING=y
++++++ kabi.tar.bz2 ++++++
++++++ minmem ++++++
--- kernel-source/minmem 2008-10-13 23:31:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/minmem 2008-10-14 16:03:44.612799000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- kernel-source/needed_space_in_mb 2008-10-13 23:31:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2008-10-14 16:03:44.614787000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.addon.tar.bz2 ++++++
++++++ patches.apparmor.tar.bz2 ++++++
++++++ patches.arch.tar.bz2 ++++++
++++++ patches.drivers.tar.bz2 ++++++
++++ 7294 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/input-add-amilo-pro-v-to-nomux.patch new/patches.fixes/input-add-amilo-pro-v-to-nomux.patch
--- old/patches.fixes/input-add-amilo-pro-v-to-nomux.patch 2008-10-08 18:51:18.000000000 +0200
+++ new/patches.fixes/input-add-amilo-pro-v-to-nomux.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-From: Jiri Kosina
-Subject: Add Fujitsu-Siemens Amilo Pro 2010 and 2030 to nomux list
-References: bnc#345699 bnc#389169
-
-Add Fujitsu-Siemens Amilo Pro 2010 and 2030 to nomux list.
-
-Signed-off-by: Jiri Kosina
-
----
- drivers/input/serio/i8042-x86ia64io.h | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -217,6 +217,20 @@ static struct dmi_system_id __initdata i
- },
- },
- {
-+ .ident = "Fujitsu-Siemens Amilo Pro 2010",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro V2010"),
-+ },
-+ },
-+ {
-+ .ident = "Fujitsu-Siemens Amilo Pro 2030",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-+ DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"),
-+ },
-+ },
-+ {
- /*
- * No data is coming from the touchscreen unless KBC
- * is in legacy mode.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/reiserfs-commit-ids-unsigned-ints new/patches.fixes/reiserfs-commit-ids-unsigned-ints
--- old/patches.fixes/reiserfs-commit-ids-unsigned-ints 2008-08-25 21:43:12.000000000 +0200
+++ new/patches.fixes/reiserfs-commit-ids-unsigned-ints 2008-10-14 15:54:51.000000000 +0200
@@ -197,6 +197,15 @@
int trans_half;
BUG_ON(th->t_refcount > 1);
+@@ -3953,7 +3953,7 @@ static int do_journal_end(struct reiserf
+
+ /* protect flush_older_commits from doing mistakes if the
+ transaction ID counter gets overflowed. */
+- if (th->t_trans_id == ~0UL)
++ if (th->t_trans_id == ~0U)
+ flags |= FLUSH_ALL | COMMIT_NOW | WAIT;
+ flush = flags & FLUSH_ALL;
+ wait_on_commit = flags & WAIT;
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -323,7 +323,7 @@ static int show_journal(struct seq_file
++++++ patches.kernel.org.tar.bz2 ++++++
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.rt.tar.bz2 ++++++
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/osync-error new/patches.suse/osync-error
--- old/patches.suse/osync-error 2008-10-13 22:06:37.000000000 +0200
+++ new/patches.suse/osync-error 2008-10-14 15:54:53.000000000 +0200
@@ -8,11 +8,20 @@
Acked-by: Jeff Mahoney
---
- mm/filemap.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
+ mm/filemap.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
--- a/mm/filemap.c
+++ b/mm/filemap.c
+@@ -2627,7 +2627,7 @@ generic_file_buffered_write(struct kiocb
+
+ if (likely(status >= 0)) {
+ written += status;
+- *ppos = pos + status;
++ pos += status;
+
+ /*
+ * For now, when the user asks for O_SYNC, we'll actually give
@@ -2645,9 +2645,22 @@ generic_file_buffered_write(struct kiocb
* to buffered writes (block instantiation inside i_size). So we sync
* the file data here, to try to honour O_DIRECT expectations.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-no-LDFLAGS_MODULE.patch new/patches.suse/ppc-no-LDFLAGS_MODULE.patch
--- old/patches.suse/ppc-no-LDFLAGS_MODULE.patch 2008-10-08 08:58:35.000000000 +0200
+++ new/patches.suse/ppc-no-LDFLAGS_MODULE.patch 2008-10-14 15:54:53.000000000 +0200
@@ -1,82 +1,32 @@
-Subject: [Bug 11143] unconditional linker option arch/powerpc/lib/crtsavres.o causes external module buildfailure
-From: bugme-daemon@bugzilla.kernel.org
+Subject: arch/powerpc/lib/crtsavres.o is not available when linking external modules
+From: olh@suse.de
+Patch-mainline: never
-Fix linking modules against crtsavres.o
-
-Previously we got
- CC drivers/char/hw_random/rng-core.mod.o
- LD [M] drivers/char/hw_random/rng-core.ko
-/there/src/buildroot.git.ppc/build_powerpc_nofpu/staging_dir/usr/bin/powerpc-linux-uclibc-ld: arch/powerpc/lib/crtsavres.o: No such file: No such file or directory
-
- * Makefile (LDFLAGS_MODULE_PREREQ): New variable to hold prerequisite
- files for modules.
- * arch/powerpc/Makefile: add crtsavres.o to LDFLAGS_MODULE_PREREQ.
- * scripts/Makefile.modpost (cmd_as_o_S): Copy from Makefile.build.
- (cmd_ld_ko_o): Also link LDFLAGS_MODULE_PREREQ.
- Provide rule to build objects from assembler.
-
-Signed-off-by: Bernhard Reutner-Fischer
-Signed-off-by: Olaf Hering
+Maybe it helps.
---
- Makefile | 3 ++-
- arch/powerpc/Makefile | 2 +-
- scripts/Makefile.modpost | 11 +++++++++--
- 3 files changed, 12 insertions(+), 4 deletions(-)
+ arch/powerpc/Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
---- a/Makefile
-+++ b/Makefile
-@@ -325,6 +325,7 @@ MODFLAGS = -DMODULE
- CFLAGS_MODULE = $(MODFLAGS)
- AFLAGS_MODULE = $(MODFLAGS)
- LDFLAGS_MODULE =
-+LDFLAGS_MODULE_PREREQ =
- CFLAGS_KERNEL =
- AFLAGS_KERNEL =
-
-@@ -355,7 +356,7 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL)
- export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
- export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
- export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
--export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
-+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS
-
- export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
- export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
-@@ -91,7 +91,7 @@ else
- KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
+@@ -83,15 +83,17 @@ ifeq ($(GCC_BROKEN_VEC),y)
+ KBUILD_CFLAGS += $(call cc-option,-mcpu=970)
+ else
+ KBUILD_CFLAGS += $(call cc-option,-mcpu=power4)
++# GCC_BROKEN_VEC
endif
else
+ KBUILD_CFLAGS += $(call cc-option,-mcpu=power4)
++# CONFIG_ALTIVEC
+ endif
+ else
+ KBUILD_CFLAGS += $(call cc-option,-mtune=power4)
++# CONFIG_POWER4_ONLY
+ endif
+-else
-LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
-+LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o
++# CONFIG_PPC64
endif
ifeq ($(CONFIG_TUNE_CELL),y)
---- a/scripts/Makefile.modpost
-+++ b/scripts/Makefile.modpost
-@@ -124,14 +124,21 @@ quiet_cmd_cc_o_c = CC $@
- cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE) \
- -c -o $@ $<
-
--$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE
-+quiet_cmd_as_o_S = AS $(quiet_modtag) $@
-+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $<
-+
-+$(LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE
-+ $(call if_changed_dep,as_o_S)
-+
-+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(LDFLAGS_MODULE_PREREQ) FORCE
- $(call if_changed_dep,cc_o_c)
-
- targets += $(modules:.ko=.mod.o)
-
- # Step 6), final link of the modules
- quiet_cmd_ld_ko_o = LD [M] $@
-- cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@ \
-+ cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE_PREREQ) \
-+ $(LDFLAGS_MODULE) -o $@ \
- $(filter-out FORCE,$^)
-
- $(modules): %.ko :%.o %.mod.o FORCE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rlimit-memlock-64k.patch new/patches.suse/rlimit-memlock-64k.patch
--- old/patches.suse/rlimit-memlock-64k.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/rlimit-memlock-64k.patch 2008-10-14 14:04:43.000000000 +0200
@@ -0,0 +1,34 @@
+From: Kurt Garloff
+Subject: Increase default RLIMIT_MEMLOCK to 64k
+References: bnc#329675
+Patch-Mainline: no (should be submitted)
+
+By default, non-privileged tasks can only mlock() a small amount of
+memory to avoid a DoS attack by ordinary users. The Linux kernel
+defaulted to 32k (on a 4k page size system) to accommodate the
+needs of gpg.
+However, newer gpg2 needs 64k in various circumstances and otherwise
+fails miserably, see bnc#329675.
+
+Change the default to 64k, and make it more agnostic to PAGE_SIZE.
+
+Signed-off-by: Kurt Garloff
+Signed-off-by: Nick Piggin
+---
+Index: linux-2.6.27/include/linux/resource.h
+===================================================================
+--- linux-2.6.27.orig/include/linux/resource.h
++++ linux-2.6.27/include/linux/resource.h
+@@ -59,10 +59,10 @@ struct rlimit {
+ #define _STK_LIM (8*1024*1024)
+
+ /*
+- * GPG wants 32kB of mlocked memory, to make sure pass phrases
++ * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
+ * and other sensitive information are never written to disk.
+ */
+-#define MLOCK_LIMIT (8 * PAGE_SIZE)
++#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
+
+ /*
+ * Due to binary compatibility, the actual resource numbers
++++++ patches.trace.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.trace/utrace-core new/patches.trace/utrace-core
--- old/patches.trace/utrace-core 2008-10-13 13:17:31.000000000 +0200
+++ new/patches.trace/utrace-core 2008-10-14 15:54:54.000000000 +0200
@@ -33,15 +33,15 @@
Documentation/DocBook/utrace.tmpl | 566 ++++++++
fs/proc/array.c | 3
include/linux/sched.h | 5
- include/linux/tracehook.h | 69 +
+ include/linux/tracehook.h | 71 +
include/linux/utrace.h | 711 ++++++++++
init/Kconfig | 10
kernel/Makefile | 1
kernel/utrace.c | 2495 ++++++++++++++++++++++++++++++++++++++
- 9 files changed, 3860 insertions(+), 2 deletions(-)
+ 9 files changed, 3862 insertions(+), 2 deletions(-)
---- linux-2.6.26.orig/Documentation/DocBook/Makefile 2008-10-02 14:30:27.000000000 +0200
-+++ linux-2.6.26/Documentation/DocBook/Makefile 2008-10-02 14:35:46.000000000 +0200
+--- linux-2.6.27.orig/Documentation/DocBook/Makefile 2008-10-10 00:13:53.000000000 +0200
++++ linux-2.6.27/Documentation/DocBook/Makefile 2008-10-14 10:20:35.000000000 +0200
@@ -7,7 +7,7 @@
# list of DOCBOOKS.
@@ -52,7 +52,7 @@
kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.26/Documentation/DocBook/utrace.tmpl 2008-10-02 14:35:46.000000000 +0200
++++ linux-2.6.27/Documentation/DocBook/utrace.tmpl 2008-10-14 10:20:35.000000000 +0200
@@ -0,0 +1,566 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -620,8 +620,8 @@
+</chapter>
+
+</book>
---- linux-2.6.26.orig/fs/proc/array.c 2008-10-02 14:32:17.000000000 +0200
-+++ linux-2.6.26/fs/proc/array.c 2008-10-02 14:35:46.000000000 +0200
+--- linux-2.6.27.orig/fs/proc/array.c 2008-10-10 00:13:53.000000000 +0200
++++ linux-2.6.27/fs/proc/array.c 2008-10-14 10:20:35.000000000 +0200
@@ -81,6 +81,7 @@
#include
#include
@@ -639,8 +639,8 @@
task_lock(p);
if (p->files)
fdt = files_fdtable(p->files);
---- linux-2.6.26.orig/include/linux/sched.h 2008-10-02 14:32:27.000000000 +0200
-+++ linux-2.6.26/include/linux/sched.h 2008-10-02 14:35:46.000000000 +0200
+--- linux-2.6.27.orig/include/linux/sched.h 2008-10-14 10:19:52.000000000 +0200
++++ linux-2.6.27/include/linux/sched.h 2008-10-14 10:21:42.000000000 +0200
@@ -1196,6 +1196,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -653,8 +653,8 @@
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
---- linux-2.6.26.orig/include/linux/tracehook.h 2008-10-02 14:32:18.000000000 +0200
-+++ linux-2.6.26/include/linux/tracehook.h 2008-10-02 14:40:02.000000000 +0200
+--- linux-2.6.27.orig/include/linux/tracehook.h 2008-10-10 00:13:53.000000000 +0200
++++ linux-2.6.27/include/linux/tracehook.h 2008-10-14 10:25:27.000000000 +0200
@@ -49,6 +49,7 @@
#include
#include
@@ -756,13 +756,15 @@
}
/**
-@@ -358,7 +382,23 @@ static inline void tracehook_prepare_rel
+@@ -358,7 +382,25 @@ static inline void tracehook_prepare_rel
*/
static inline void tracehook_finish_release_task(struct task_struct *task)
{
+#ifdef CONFIG_UTRACE
+ int bad = 0;
++#endif
ptrace_release_task(task);
++#ifdef CONFIG_UTRACE
+ BUG_ON(task->exit_state != EXIT_DEAD);
+ if (unlikely(task_utrace_struct(task) != NULL)) {
+ /*
@@ -780,7 +782,7 @@
}
/**
-@@ -380,6 +420,8 @@ static inline void tracehook_signal_hand
+@@ -380,6 +422,8 @@ static inline void tracehook_signal_hand
const struct k_sigaction *ka,
struct pt_regs *regs, int stepping)
{
@@ -789,7 +791,7 @@
if (stepping)
ptrace_notify(SIGTRAP);
}
-@@ -400,6 +442,8 @@ static inline int tracehook_consider_ign
+@@ -400,6 +444,8 @@ static inline int tracehook_consider_ign
int sig,
void __user *handler)
{
@@ -798,7 +800,7 @@
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -421,6 +465,9 @@ static inline int tracehook_consider_fat
+@@ -421,6 +467,9 @@ static inline int tracehook_consider_fat
int sig,
void __user *handler)
{
@@ -808,7 +810,7 @@
return (task_ptrace(task) & PT_PTRACED) != 0;
}
-@@ -435,6 +482,8 @@ static inline int tracehook_consider_fat
+@@ -435,6 +484,8 @@ static inline int tracehook_consider_fat
*/
static inline int tracehook_force_sigpending(void)
{
@@ -817,7 +819,7 @@
return 0;
}
-@@ -464,6 +513,8 @@ static inline int tracehook_get_signal(s
+@@ -464,6 +515,8 @@ static inline int tracehook_get_signal(s
siginfo_t *info,
struct k_sigaction *return_ka)
{
@@ -826,7 +828,7 @@
return 0;
}
-@@ -484,6 +535,8 @@ static inline int tracehook_get_signal(s
+@@ -484,6 +537,8 @@ static inline int tracehook_get_signal(s
*/
static inline int tracehook_notify_jctl(int notify, int why)
{
@@ -835,25 +837,18 @@
return notify || (current->ptrace & PT_PTRACED);
}
-@@ -507,6 +560,9 @@ static inline int tracehook_notify_jctl(
+@@ -507,6 +562,10 @@ static inline int tracehook_notify_jctl(
static inline int tracehook_notify_death(struct task_struct *task,
void **death_cookie, int group_dead)
{
+#ifdef CONFIG_UTRACE
+ *death_cookie = task_utrace_struct(task);
++#endif
+
if (task->exit_signal == -1)
return task->ptrace ? SIGCHLD : DEATH_REAP;
-@@ -519,6 +575,7 @@ static inline int tracehook_notify_death
- return task->exit_signal;
-
- return task->ptrace ? SIGCHLD : DEATH_DELAYED_GROUP_LEADER;
-+#endif
- }
-
- /**
-@@ -543,6 +600,12 @@ static inline void tracehook_report_deat
+@@ -543,6 +602,12 @@ static inline void tracehook_report_deat
int signal, void *death_cookie,
int group_dead)
{
@@ -866,7 +861,7 @@
}
#ifdef TIF_NOTIFY_RESUME
-@@ -572,10 +635,14 @@ static inline void set_notify_resume(str
+@@ -572,10 +637,14 @@ static inline void set_notify_resume(str
* asynchronously, this will be called again before we return to
* user mode.
*
@@ -883,7 +878,7 @@
#endif /* TIF_NOTIFY_RESUME */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.26/include/linux/utrace.h 2008-10-02 14:35:46.000000000 +0200
++++ linux-2.6.27/include/linux/utrace.h 2008-10-14 10:20:35.000000000 +0200
@@ -0,0 +1,711 @@
+/*
+ * utrace infrastructure interface for debugging user processes
@@ -1596,8 +1591,8 @@
+#endif /* CONFIG_UTRACE */
+
+#endif /* linux/utrace.h */
---- linux-2.6.26.orig/init/Kconfig 2008-10-02 14:33:12.000000000 +0200
-+++ linux-2.6.26/init/Kconfig 2008-10-02 14:35:46.000000000 +0200
+--- linux-2.6.27.orig/init/Kconfig 2008-10-14 10:20:32.000000000 +0200
++++ linux-2.6.27/init/Kconfig 2008-10-14 10:20:35.000000000 +0200
@@ -909,6 +909,16 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
@@ -1615,8 +1610,8 @@
source "block/Kconfig"
config PREEMPT_NOTIFIERS
---- linux-2.6.26.orig/kernel/Makefile 2008-10-02 14:33:12.000000000 +0200
-+++ linux-2.6.26/kernel/Makefile 2008-10-02 14:35:46.000000000 +0200
+--- linux-2.6.27.orig/kernel/Makefile 2008-10-14 10:20:32.000000000 +0200
++++ linux-2.6.27/kernel/Makefile 2008-10-14 10:20:35.000000000 +0200
@@ -65,6 +65,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
@@ -1626,7 +1621,7 @@
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.26/kernel/utrace.c 2008-10-02 14:35:46.000000000 +0200
++++ linux-2.6.27/kernel/utrace.c 2008-10-14 10:20:35.000000000 +0200
@@ -0,0 +1,2495 @@
+/*
+ * utrace infrastructure interface for debugging user processes
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-irq-probe new/patches.xen/xen-irq-probe
--- old/patches.xen/xen-irq-probe 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.xen/xen-irq-probe 2008-10-14 10:55:39.000000000 +0200
@@ -0,0 +1,47 @@
+From: jbeulich@novell.com
+Subject: restrict IRQ probing
+Patch-mainline: obsolete
+References: bnc#431572
+
+- dynamic IRQs must never be probed
+- physical IRQs should only be probed when registered or identity-mapped
+
+Index: head-2008-10-01/drivers/xen/core/evtchn.c
+===================================================================
+--- head-2008-10-01.orig/drivers/xen/core/evtchn.c 2008-09-17 14:06:19.000000000 +0200
++++ head-2008-10-01/drivers/xen/core/evtchn.c 2008-10-02 16:52:17.000000000 +0200
+@@ -784,7 +784,16 @@ static struct irq_chip dynirq_chip = {
+
+ void evtchn_register_pirq(int irq)
+ {
++ struct irq_desc *desc;
++ unsigned long flags;
++
+ irq_info[irq] = mk_irq_info(IRQT_PIRQ, irq, 0);
++
++ /* Cannot call set_irq_probe(), as that's marked __init. */
++ desc = irq_desc + irq;
++ spin_lock_irqsave(&desc->lock, flags);
++ desc->status &= ~IRQ_NOPROBE;
++ spin_unlock_irqrestore(&desc->lock, flags);
+ }
+
+ #if defined(CONFIG_X86_IO_APIC)
+@@ -1177,7 +1186,7 @@ void __init xen_init_IRQ(void)
+ for (i = DYNIRQ_BASE; i < (DYNIRQ_BASE + NR_DYNIRQS); i++) {
+ irq_bindcount[i] = 0;
+
+- irq_desc[i].status = IRQ_DISABLED;
++ irq_desc[i].status = IRQ_DISABLED|IRQ_NOPROBE;
+ irq_desc[i].action = NULL;
+ irq_desc[i].depth = 1;
+ set_irq_chip_and_handler_name(i, &dynirq_chip,
+@@ -1196,6 +1205,8 @@ void __init xen_init_IRQ(void)
+ #endif
+
+ irq_desc[i].status = IRQ_DISABLED;
++ if (!identity_mapped_irq(i))
++ irq_desc[i].status |= IRQ_NOPROBE;
+ irq_desc[i].action = NULL;
+ irq_desc[i].depth = 1;
+ set_irq_chip_and_handler_name(i, &pirq_chip,
++++++ post.sh ++++++
--- kernel-source/post.sh 2008-10-13 22:07:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/post.sh 2008-10-14 16:03:33.474938000 +0200
@@ -43,12 +43,17 @@
if [ -x /sbin/module_upgrade ]; then
/sbin/module_upgrade --rename mptscsih="mptspi mptfc mptsas"
fi
-
- # Add symlinks of compatible modules to /lib/modules/$krel/weak-updates/.
- if [ -x /usr/lib/module-init-tools/weak-modules ]; then
- /usr/lib/module-init-tools/weak-modules --add-kernel @KERNELRELEASE@
+fi
+# Add symlinks of compatible modules to /lib/modules/$krel/weak-updates/,
+# run depmod and mkinitrd
+wm2=/usr/lib/module-init-tools/weak-modules2
+if [ -x $wm2 ]; then
+ if [ @BASE_PACKAGE@ = 1 ]; then
+ $wm2 --add-kernel @KERNELRELEASE@
+ else
+ nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@
+ rpm -ql $nvr | $wm2 --add-kernel-modules @KERNELRELEASE@ || :
fi
- /sbin/depmod -a -F /boot/System.map-@KERNELRELEASE@ @KERNELRELEASE@
fi
message_install_bl () {
@@ -69,21 +74,10 @@
fi
}
-if [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then
- if ! /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \
- -i /boot/initrd-@KERNELRELEASE@; then
- # mkinitrd fails with status 10 if any required kernel modules missing.
- # We expect those modules to be added later (by one of the other
- # kernel-$flavor packages).
- if [ $? -ne 10 ]; then
- echo "/sbin/mkinitrd failed" >&2
- exit 1
- fi
- fi
-
+if [ -f /etc/fstab -a ! -e /.buildenv ] ; then
# only run the bootloader if the usual bootloader configuration
# files are there -- this is different on every architecture
- initrd=/boot/initrd-@KERNELRELEASE@
+ initrd=initrd-@KERNELRELEASE@
if [ -e $initrd -o ! -e /lib/modules/@KERNELRELEASE@ ] && \
run_bootloader ; then
[ -e $initrd ] || initrd=
++++++ postun.sh ++++++
--- kernel-source/postun.sh 2008-10-13 22:07:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/postun.sh 2008-10-14 16:03:33.482930000 +0200
@@ -1,6 +1,15 @@
+wm2=/usr/lib/module-init-tools/weak-modules2
+if [ @BASE_PACKAGE@ = 0 ]; then
+ if [ -x $wm2 ]; then
+ nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@
+ $wm2 --remove-kernel-modules @KERNELRELEASE@ < /var/run/rpm-$nvr-modules || :
+ fi
+ rm -f /var/run/rpm-$nvr-modules
+ exit 0
+fi
# Remove symlinks from /lib/modules/$krel/weak-updates/.
-if [ -x /usr/lib/module-init-tools/weak-modules ]; then
- /usr/lib/module-init-tools/weak-modules --remove-kernel @KERNELRELEASE@
+if [ -x $wm2 ]; then
+ $wm2 --remove-kernel @KERNELRELEASE@
fi
# remove /boot/@IMAGE@.previous entry on a 10.1 and SLES10 GA system
++++++ pre.sh ++++++
--- kernel-source/pre.sh 2008-10-13 22:07:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/pre.sh 2008-10-14 16:03:33.468944000 +0200
@@ -6,7 +6,7 @@
# this will double the required space below /boot
# remove the files from the old packages to make room for the new initrd
# rpm may complain about low disk space if /boot/vmlinux does not fit
-if [ "$YAST_IS_RUNNING" != "" ]; then
+if [ @BASE_PACKAGE@ = 1 -a "$YAST_IS_RUNNING" != "" ]; then
mydf="$( POSIXLY_CORRECT=1 df -P /boot/ | awk '/^(\/|-[[:blank:]])/{ print $4}' )"
if test "$mydf" != "" ; then
echo "Free diskspace below /boot: $mydf blocks"
++++++ series.conf ++++++
--- kernel-source/series.conf 2008-10-13 22:06:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-10-14 16:03:09.517919000 +0200
@@ -27,12 +27,6 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
-# patches.kernel.org/patch-2.6.27-rc4
-# patches.kernel.org/patch-2.6.27-rc4-rc5
-# patches.kernel.org/patch-2.6.27-rc5-rc6
-# patches.kernel.org/patch-2.6.27-rc6-rc7
-# patches.kernel.org/patch-2.6.27-rc7-rc8
-# patches.kernel.org/patch-2.6.27-rc8-rc9
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -269,6 +263,7 @@
patches.suse/connector-read-mostly
patches.suse/kbd-ignore-gfx.patch
patches.fixes/ds1682-build-fix
+ patches.suse/rlimit-memlock-64k.patch
########################################################
#
@@ -646,7 +641,6 @@
# Input & Console
########################################################
patches.suse/bootsplash
- patches.fixes/input-add-amilo-pro-v-to-nomux.patch
patches.drivers/elousb.patch
##########################################################
@@ -878,6 +872,8 @@
patches.drivers/0022-Staging-SLICOSS-Call-pci_release_regions-at-driver.patch
patches.drivers/0023-Staging-Lindent-sxg.c.patch
patches.drivers/staging-workaround-build-system-bug.patch
+ patches.drivers/staging-at76_usb-wireless-driver.patch
+ patches.drivers/staging-add-pcc-acpi-driver.patch
########################################################
# You'd better have a good reason for adding a patch
@@ -990,6 +986,7 @@
-RT patches.xen/xen-scsifront-block-timeout-update
-RT patches.xen/xen-op-packet
-RT patches.xen/xen-blkfront-cdrom
+-RT patches.xen/xen-irq-probe
-RT patches.xen/xen-x2APIC_build_fix.patch
++++++ source-post.sh ++++++
--- kernel-source/source-post.sh 2008-10-13 22:07:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/source-post.sh 2008-10-14 16:03:33.458954000 +0200
@@ -1,2 +1,14 @@
+relink() {
+ if [ -h "$2" ]; then
+ local old=$(readlink "$2")
+ [ "$old" = "$1" ] && return 0
+ echo "Changing symlink $2 from $old to $1"
+ elif [ -e "$2" ]; then
+ echo "Replacing file $2 with symlink to $1"
+ fi
+ rm -f "$2" \
+ && ln -s "$1" "$2"
+}
+
relink linux-@KERNELRELEASE@@VARIANT@ /usr/src/linux@VARIANT@
relink linux-@KERNELRELEASE@@VARIANT@-obj /usr/src/linux@VARIANT@-obj
++++++ supported.conf ++++++
--- kernel-source/supported.conf 2008-10-13 22:07:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/supported.conf 2008-10-14 16:03:33.034381000 +0200
@@ -486,7 +486,7 @@
kernel/drivers/i2c/busses/i2c-parport-light # I2C bus over parallel port (light)
kernel/drivers/i2c/busses/i2c-pca-isa # ISA base PCA9564 driver
kernel/drivers/i2c/busses/i2c-pca-platform
-+base kernel/drivers/i2c/busses/i2c-piix4
+ kernel/drivers/i2c/busses/i2c-piix4
kernel/drivers/i2c/busses/i2c-simtec
kernel/drivers/i2c/busses/i2c-sis5595 # SIS5595 SMBus driver
kernel/drivers/i2c/busses/i2c-sis630 # SIS630 SMBus driver
@@ -508,11 +508,11 @@
- kernel/drivers/i2c/chips/pcf8575 # PCF8575 GPIO driver (deprecated)
kernel/drivers/i2c/chips/pcf8591 # PCF8591 driver
kernel/drivers/i2c/chips/tsl2550 # Light sensor
-+base kernel/drivers/i2c/i2c-core # I2C-Bus main module
+ kernel/drivers/i2c/i2c-core # I2C-Bus main module
kernel/drivers/i2c/i2c-dev # I2C /dev entries driver
kernel/drivers/ide/ide-cd_mod
-+base kernel/drivers/ide/ide-core
-+base kernel/drivers/ide/ide-disk
+ kernel/drivers/ide/ide-core
+ kernel/drivers/ide/ide-disk
kernel/drivers/ide/ide-floppy
kernel/drivers/ide/ide-generic
kernel/drivers/ide/ide-pnp
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org