From 14874086dd63648cefdec5cadf612b426f987df38f674e924e2f66a2434df604 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 14 Oct 2008 16:16:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=23 --- build-source-timestamp | 2 +- config.tar.bz2 | 4 +- functions.sh | 11 ---- kabi.tar.bz2 | 4 +- kernel-debug.changes | 110 +++++++++++++++++++++++++++++++ kernel-debug.spec | 131 +++++++++++++++++++++++++++++-------- kernel-default.changes | 110 +++++++++++++++++++++++++++++++ kernel-default.spec | 131 +++++++++++++++++++++++++++++-------- kernel-dummy.changes | 110 +++++++++++++++++++++++++++++++ kernel-dummy.spec | 60 ++++++++++++++++- kernel-kdump.changes | 110 +++++++++++++++++++++++++++++++ kernel-kdump.spec | 131 +++++++++++++++++++++++++++++-------- kernel-pae.changes | 110 +++++++++++++++++++++++++++++++ kernel-pae.spec | 131 +++++++++++++++++++++++++++++-------- kernel-ppc64.changes | 110 +++++++++++++++++++++++++++++++ kernel-ppc64.spec | 131 +++++++++++++++++++++++++++++-------- kernel-ps3.changes | 110 +++++++++++++++++++++++++++++++ kernel-ps3.spec | 131 +++++++++++++++++++++++++++++-------- kernel-rt.changes | 110 +++++++++++++++++++++++++++++++ kernel-rt.spec | 131 +++++++++++++++++++++++++++++-------- kernel-rt_debug.changes | 110 +++++++++++++++++++++++++++++++ kernel-rt_debug.spec | 131 +++++++++++++++++++++++++++++-------- kernel-s390.changes | 110 +++++++++++++++++++++++++++++++ kernel-s390.spec | 131 +++++++++++++++++++++++++++++-------- kernel-source-rt.changes | 110 +++++++++++++++++++++++++++++++ kernel-source-rt.spec | 86 +++++++++++++++++++----- kernel-source.changes | 110 +++++++++++++++++++++++++++++++ kernel-source.spec | 86 +++++++++++++++++++----- kernel-syms-rt.changes | 110 +++++++++++++++++++++++++++++++ kernel-syms-rt.spec | 60 ++++++++++++++++- kernel-syms.changes | 110 +++++++++++++++++++++++++++++++ kernel-syms.spec | 60 ++++++++++++++++- kernel-trace.changes | 110 +++++++++++++++++++++++++++++++ kernel-trace.spec | 131 +++++++++++++++++++++++++++++-------- kernel-vanilla.changes | 110 +++++++++++++++++++++++++++++++ kernel-vanilla.spec | 131 +++++++++++++++++++++++++++++-------- kernel-xen.changes | 110 +++++++++++++++++++++++++++++++ kernel-xen.spec | 131 +++++++++++++++++++++++++++++-------- patches.addon.tar.bz2 | 4 +- patches.apparmor.tar.bz2 | 4 +- patches.arch.tar.bz2 | 4 +- patches.drivers.tar.bz2 | 4 +- patches.fixes.tar.bz2 | 4 +- patches.kernel.org.tar.bz2 | 4 +- patches.rpmify.tar.bz2 | 4 +- patches.rt.tar.bz2 | 4 +- patches.suse.tar.bz2 | 4 +- patches.trace.tar.bz2 | 4 +- patches.uml.tar.bz2 | 4 +- patches.xen.tar.bz2 | 4 +- post.sh | 30 ++++----- postun.sh | 13 +++- pre.sh | 2 +- preun.sh | 4 ++ series.conf | 11 ++-- source-post.sh | 12 ++++ supported.conf | 8 +-- 57 files changed, 3497 insertions(+), 446 deletions(-) delete mode 100644 functions.sh create mode 100644 preun.sh diff --git a/build-source-timestamp b/build-source-timestamp index b631772c..e939055a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1 +1 @@ -2008-10-13 21:37:58 +0200 +2008-10-14 16:02:55 +0200 diff --git a/config.tar.bz2 b/config.tar.bz2 index d6778401..0cdcc022 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a75512772e940cc472b0a9ba0fb2e903f4c99d9c9b62b9d346ce24d1d8e0e4ea -size 135232 +oid sha256:046b2cbff3f0d962842f44712490ce650019c63db8167619d462ab8a5c05dcb4 +size 135500 diff --git a/functions.sh b/functions.sh deleted file mode 100644 index 87dddd2b..00000000 --- a/functions.sh +++ /dev/null @@ -1,11 +0,0 @@ -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" -} diff --git a/kabi.tar.bz2 b/kabi.tar.bz2 index 0ad9de7b..f403632c 100644 --- a/kabi.tar.bz2 +++ b/kabi.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3fc94d8992415d9208df741b974d06586718c6d14959ae0f6e9b4c5935eb177 -size 2273 +oid sha256:f1ed544d35336321c457eb9cf956206a163fdff8db6beddc19502ce38f9c844a +size 2265 diff --git a/kernel-debug.changes b/kernel-debug.changes index b74e063b..6415c493 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index 1c3c8d72..fe38a27f 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -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 @@ Provides: kernel = 2.6.27-%source_rel %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: rfswitch-kmp 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 @@ Only use this kernel when investigating problems. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-debug-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-debug-base -f post-base.sh +%postun base -f postun-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 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-debug-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-default.changes b/kernel-default.changes index b74e063b..6415c493 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 6609539e..4eed292b 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -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 @@ Obsoletes: k_deflt k_numa k_smp smp kernel-smp %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: rfswitch-kmp 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 @@ The standard kernel for both uniprocessor and multiprocessor systems. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-default-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-default-base -f post-base.sh +%postun base -f postun-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 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-default-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-dummy.changes b/kernel-dummy.changes index b74e063b..6415c493 100644 --- a/kernel-dummy.changes +++ b/kernel-dummy.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-dummy.spec b/kernel-dummy.spec index 75d87c40..bdfbbd0b 100644 --- a/kernel-dummy.spec +++ b/kernel-dummy.spec @@ -23,7 +23,7 @@ Url: http://www.kernel.org/ 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 @@ Authors: -------- 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 @@ echo dummy > %buildroot/etc/dummy %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 diff --git a/kernel-kdump.changes b/kernel-kdump.changes index b74e063b..6415c493 100644 --- a/kernel-kdump.changes +++ b/kernel-kdump.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-kdump.spec b/kernel-kdump.spec index 7b661e4f..563b2387 100644 --- a/kernel-kdump.spec +++ b/kernel-kdump.spec @@ -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 @@ Provides: kernel = 2.6.27-%source_rel %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: rfswitch-kmp 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 @@ crashed kernel. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-kdump-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-kdump-base -f post-base.sh +%postun base -f postun-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 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-kdump-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-pae.changes b/kernel-pae.changes index b74e063b..6415c493 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index 156868a5..921b72cd 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -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: kernel = 2.6.27-%source_rel 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: rfswitch-kmp 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 @@ that support it, regardless of the amount of main memory. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-pae-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-pae-base -f post-base.sh +%postun base -f postun-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 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-pae-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index b74e063b..6415c493 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index a8c78b03..22fd3a3e 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -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 @@ Obsoletes: kernel-pmac64 kernel-pseries64 kernel-iseries64 %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: rfswitch-kmp 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 @@ Authors: 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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ Authors: 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 -%pre -n kernel-ppc64-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-ppc64-base -f post-base.sh +%postun base -f postun-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 @@ Authors: 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 -%post -n kernel-ppc64-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-ps3.changes b/kernel-ps3.changes index b74e063b..6415c493 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 4848aaf7..5de3ad11 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -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 @@ Provides: kernel = 2.6.27-%source_rel %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: rfswitch-kmp 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 @@ needs to be as small as possible. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ needs to be as small as possible. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-ps3-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-ps3-base -f post-base.sh +%postun base -f postun-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 @@ needs to be as small as possible. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-ps3-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-rt.changes b/kernel-rt.changes index b74e063b..6415c493 100644 --- a/kernel-rt.changes +++ b/kernel-rt.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-rt.spec b/kernel-rt.spec index 956291f5..1e482661 100644 --- a/kernel-rt.spec +++ b/kernel-rt.spec @@ -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 @@ Provides: kernel = 2.6.27-%source_rel %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: rfswitch-kmp 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 @@ Authors: 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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ Authors: 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 -%pre -n kernel-rt-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-rt-base -f post-base.sh +%postun base -f postun-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 @@ Authors: 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 -%post -n kernel-rt-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-rt_debug.changes b/kernel-rt_debug.changes index b74e063b..6415c493 100644 --- a/kernel-rt_debug.changes +++ b/kernel-rt_debug.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-rt_debug.spec b/kernel-rt_debug.spec index e874b683..03dd0229 100644 --- a/kernel-rt_debug.spec +++ b/kernel-rt_debug.spec @@ -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 @@ Provides: kernel = 2.6.27-%source_rel %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: rfswitch-kmp 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 @@ Only use this kernel when investigating problems. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-rt_debug-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-rt_debug-base -f post-base.sh +%postun base -f postun-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 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-rt_debug-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-s390.changes b/kernel-s390.changes index b74e063b..6415c493 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-s390.spec b/kernel-s390.spec index 84ab07dc..98fab43e 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -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 = 2.6.27-%source_rel 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: rfswitch-kmp 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 @@ The standard kernel. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-s390-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-s390-base -f post-base.sh +%postun base -f postun-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 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-s390-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-source-rt.changes b/kernel-source-rt.changes index b74e063b..6415c493 100644 --- a/kernel-source-rt.changes +++ b/kernel-source-rt.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-source-rt.spec b/kernel-source-rt.spec index a45416a0..c69eb4a3 100644 --- a/kernel-source-rt.spec +++ b/kernel-source-rt.spec @@ -30,7 +30,7 @@ Url: http://www.kernel.org/ 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 @@ Provides: linux lx_suse lx_sus22 lx_sus24 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 @@ Authors: 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 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT/etc/rpm/ 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" \ - -e "s:@VARIANT@:$variant:g" \ - %_sourcedir/source-post.sh -) > kernel-source-rt-post.sh +sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ + -e "s:@VARIANT@:$variant:g" \ + %_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 diff --git a/kernel-source.changes b/kernel-source.changes index b74e063b..6415c493 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 4020238e..55f25139 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -30,7 +30,7 @@ Url: http://www.kernel.org/ 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 @@ Provides: linux lx_suse lx_sus22 lx_sus24 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 @@ Authors: 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 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT/etc/rpm/ 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" \ - -e "s:@VARIANT@:$variant:g" \ - %_sourcedir/source-post.sh -) > kernel-source-post.sh +sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ + -e "s:@VARIANT@:$variant:g" \ + %_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 diff --git a/kernel-syms-rt.changes b/kernel-syms-rt.changes index b74e063b..6415c493 100644 --- a/kernel-syms-rt.changes +++ b/kernel-syms-rt.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-syms-rt.spec b/kernel-syms-rt.spec index 82e881ff..4bda2db1 100644 --- a/kernel-syms-rt.spec +++ b/kernel-syms-rt.spec @@ -29,7 +29,7 @@ Url: http://www.kernel.org/ 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 @@ Authors: 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 @@ done /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 diff --git a/kernel-syms.changes b/kernel-syms.changes index b74e063b..6415c493 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index 39d134f9..1951b0f6 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -29,7 +29,7 @@ Url: http://www.kernel.org/ 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 @@ Authors: 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 @@ done /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 diff --git a/kernel-trace.changes b/kernel-trace.changes index b74e063b..6415c493 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-trace.spec b/kernel-trace.spec index 9cdaba42..67e64339 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -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 @@ Provides: kernel = 2.6.27-%source_rel %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: rfswitch-kmp 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 @@ Authors: 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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ Authors: 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 -%pre -n kernel-trace-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-trace-base -f post-base.sh +%postun base -f postun-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 @@ Authors: 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 -%post -n kernel-trace-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index b74e063b..6415c493 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index cf54e025..bfa78598 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -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 @@ Obsoletes: kernel-64bit k_deflt %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: rfswitch-kmp 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 @@ The standard kernel - without any SUSE patches -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ The standard kernel - without any SUSE patches -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-vanilla-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-vanilla-base -f post-base.sh +%postun base -f postun-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 @@ The standard kernel - without any SUSE patches -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-vanilla-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/kernel-xen.changes b/kernel-xen.changes index b74e063b..6415c493 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,113 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon Oct 13 21:33:49 CEST 2008 - gregkh@suse.de diff --git a/kernel-xen.spec b/kernel-xen.spec index 8ed9a726..e54b9055 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -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 @@ Provides: kernel = 2.6.27-%source_rel %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: rfswitch-kmp 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 @@ unprivileged ("xenU") kernel. -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 @@ add_vmlinux() %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 - 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 +%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" \ + -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 @@ add_dirs_to_filelist() { # 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 @@ This package contains only the base modules, required in all installs. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%pre -n kernel-xen-base -f pre-base.sh +%preun base -f preun-base.sh -%post -n kernel-xen-base -f post-base.sh +%postun base -f postun-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 @@ This package contains additional modules not supported by Novell. -Source Timestamp: 2008-10-13 21:37:58 +0200 +Source Timestamp: 2008-10-14 16:02:55 +0200 -%post -n kernel-xen-extra -f post-extra.sh +%preun extra -f preun-extra.sh + +%postun extra -f postun-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 diff --git a/patches.addon.tar.bz2 b/patches.addon.tar.bz2 index 705ccf39..e447f4bd 100644 --- a/patches.addon.tar.bz2 +++ b/patches.addon.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ddb9811f52b59e5881c824e43f5dc228a071898aa22bcdfdb15fcdb4e0b9b49 -size 130 +oid sha256:85f3bf91cfb7229d2b276c705e0d18a946603852e8502491549397b9e46be54e +size 127 diff --git a/patches.apparmor.tar.bz2 b/patches.apparmor.tar.bz2 index a89880da..77ce7920 100644 --- a/patches.apparmor.tar.bz2 +++ b/patches.apparmor.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29f002d25f888a1aad4271a1321a24bf5cbb799b35752b74b5a3a757e58a1c42 -size 59173 +oid sha256:cf31b0c91c9683415b64709a49e2c65953e248b5bdc50bc3fc2463ce9bc36fdc +size 59158 diff --git a/patches.arch.tar.bz2 b/patches.arch.tar.bz2 index bad3b89a..0e71e67a 100644 --- a/patches.arch.tar.bz2 +++ b/patches.arch.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:291721965679a4260144322fe4831071d5eb4efb8d681a7555d5496a95ba92ae -size 121407 +oid sha256:851afbe3a14c66603e47508d111c4ea6b3123c0886870c7e859d98e20da4f1c4 +size 121448 diff --git a/patches.drivers.tar.bz2 b/patches.drivers.tar.bz2 index ac829941..e447b703 100644 --- a/patches.drivers.tar.bz2 +++ b/patches.drivers.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e504b51b0d2f299b98b142ea8b41a49c7481a73a9806a9ad1c00a74299374996 -size 1335608 +oid sha256:0031b880031f00292ef6b62d38f2f54d5762d2b637a5db1658e03abf9ad01ea9 +size 1379825 diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index a1fd3af7..7a6cc8af 100644 --- a/patches.fixes.tar.bz2 +++ b/patches.fixes.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5e0ec99e637a7a2f3d92bcca5c255080966fc7f8bba977359537c24f5ceb241 -size 79302 +oid sha256:13e477d02627272eb8dec4aa37dbfc1b6788ba0373226981696de235ed6fca51 +size 79232 diff --git a/patches.kernel.org.tar.bz2 b/patches.kernel.org.tar.bz2 index 363c406d..36229ac9 100644 --- a/patches.kernel.org.tar.bz2 +++ b/patches.kernel.org.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c35f808bd865a0e01fafeff4c5c206d35f4b6634c3ca9efa25afebd0dd8a59d2 -size 5393 +oid sha256:80ebbe37eee1e7610af2b35b7834e012ea252663179164e4bd65587af2e44e13 +size 5389 diff --git a/patches.rpmify.tar.bz2 b/patches.rpmify.tar.bz2 index 4262799d..e7aec0b2 100644 --- a/patches.rpmify.tar.bz2 +++ b/patches.rpmify.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d4d11c26ce8a01336e06c0891999f1199744578b1ab0362354ca40007c943a6 -size 1630 +oid sha256:28e0397870af76280f57d3218a465df2f4bd5dc310548390eabbdc7d5248252b +size 1616 diff --git a/patches.rt.tar.bz2 b/patches.rt.tar.bz2 index cbdb46a4..5179f14d 100644 --- a/patches.rt.tar.bz2 +++ b/patches.rt.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c8628b09d864f6ce317cdea7922b2af9861bca3b8cf9ff340256347bf5e9641 -size 352589 +oid sha256:9218d4eacd2881a767616a83dad9e7a517684dd173274dc1c74e5841fa9a866b +size 352344 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 4dc0a995..dc776f75 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bee587883ba1eb745c32dec830d61b5e2156fe15f1b3b255be1b06add1e7549a -size 1193923 +oid sha256:13c3cc80c41197383d13e0a2067bc8d1dfb5757cb792e6f072a66a4e19a67137 +size 1193317 diff --git a/patches.trace.tar.bz2 b/patches.trace.tar.bz2 index 8a93227c..6be53e76 100644 --- a/patches.trace.tar.bz2 +++ b/patches.trace.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33d68b30ed02cb41f97b54350332e203e6c8855feda1261209ad4da31a7dee67 -size 57962 +oid sha256:b7c6bf981664957b6d5cdec233dd1246de87b9d6bcca7e60c690740c0b698c54 +size 57877 diff --git a/patches.uml.tar.bz2 b/patches.uml.tar.bz2 index b46580c7..b04fcddf 100644 --- a/patches.uml.tar.bz2 +++ b/patches.uml.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed2396f90a580e37289c890abfc64de5bc960e999be7919e3f254f12b1285b4e -size 11041 +oid sha256:3cac1f98a8aa39f4f41d55e9cc551053c71be28f80a4c04c94104f7d17217035 +size 11055 diff --git a/patches.xen.tar.bz2 b/patches.xen.tar.bz2 index 5db0b986..08181e80 100644 --- a/patches.xen.tar.bz2 +++ b/patches.xen.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2767eed2c4d324e664796fb7e4d26979cc7060a567a5c5ac82f0e5f6dd29630 -size 1460677 +oid sha256:464282c68b150d3675798c0562287140d9e39f4d8ad360217d10a3e9faddeed1 +size 1461157 diff --git a/post.sh b/post.sh index 21638749..5a914d19 100644 --- a/post.sh +++ b/post.sh @@ -43,12 +43,17 @@ if [ -e /lib/modules/@KERNELRELEASE@ ]; then 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 @@ run_bootloader () { 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= diff --git a/postun.sh b/postun.sh index 6a5c8ce9..6d25d948 100644 --- a/postun.sh +++ b/postun.sh @@ -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 diff --git a/pre.sh b/pre.sh index b4a7b07d..044c00f0 100644 --- a/pre.sh +++ b/pre.sh @@ -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" diff --git a/preun.sh b/preun.sh new file mode 100644 index 00000000..a1240a87 --- /dev/null +++ b/preun.sh @@ -0,0 +1,4 @@ +if [ @BASE_PACKAGE@ = 0 ]; then + nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@ + rpm -ql $nvr | grep '\.ko$' > /var/run/rpm-$nvr-modules +fi diff --git a/series.conf b/series.conf index 3c1512fd..9596b64c 100644 --- a/series.conf +++ b/series.conf @@ -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 diff --git a/source-post.sh b/source-post.sh index 6a2f1bd7..bdc9cc27 100644 --- a/source-post.sh +++ b/source-post.sh @@ -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 diff --git a/supported.conf b/supported.conf index 1c69e492..fbf0324a 100644 --- a/supported.conf +++ b/supported.conf @@ -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