Hello community, here is the log from the commit of package kernel-source checked in at Wed Feb 21 19:19:58 CET 2007. -------- --- kernel-source/kernel-bigsmp.changes 2007-02-17 00:54:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-02-21 18:34:50.000000000 +0100 @@ -1,0 +2,25 @@ +Wed Feb 21 17:59:11 CET 2007 - jblunck@suse.de + +- rpm/kernel-binary.spec.in: Use %build_$flavor macros to avoid typos. + +------------------------------------------------------------------- +Wed Feb 21 13:32:11 CET 2007 - trenn@suse.de + +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). + +------------------------------------------------------------------- +Wed Feb 21 11:19:40 CET 2007 - olh@suse.de + +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices + +------------------------------------------------------------------- +Mon Feb 19 20:22:11 CET 2007 - olh@suse.de + +- reenable ipr on iseries + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "bigsmp" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: Kernel with PAE Support Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-bigsmp-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -130,7 +147,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -167,7 +184,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -191,7 +208,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=bigsmp SUBARCH=$subarch @@ -286,17 +303,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -331,11 +348,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -349,7 +366,7 @@ -e "s:@FLAVOR""@:bigsmp:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-bigsmp %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -473,6 +490,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "debug" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: A Debug Version of the Kernel Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-debug-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -135,7 +152,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -172,7 +189,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -196,7 +213,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=debug SUBARCH=$subarch @@ -291,17 +308,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -336,11 +353,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -354,7 +371,7 @@ -e "s:@FLAVOR""@:debug:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-debug %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -478,6 +495,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "default" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-default-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -156,7 +173,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -193,7 +210,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -217,7 +234,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=default SUBARCH=$subarch @@ -312,17 +329,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -357,11 +374,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -375,7 +392,7 @@ -e "s:@FLAVOR""@:default:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-default %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -499,6 +516,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -15,7 +15,7 @@ URL: http://www.kernel.org/ Summary: Internal dummy package for synchronizing release numbers Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: off @@ -28,7 +28,7 @@ -------- Andreas Gruenbacher <agruen@suse.de> -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %install @@ -41,6 +41,19 @@ /etc/dummy %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "iseries64" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: 64-Bit Kernel for iSeries Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-iseries64-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -131,7 +148,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -168,7 +185,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -192,7 +209,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=iseries64 SUBARCH=$subarch @@ -287,17 +304,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -332,11 +349,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -350,7 +367,7 @@ -e "s:@FLAVOR""@:iseries64:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-iseries64 %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -474,6 +491,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "kdump" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: kernel for kdump Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-kdump-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -140,7 +157,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -177,7 +194,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -201,7 +218,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=kdump SUBARCH=$subarch @@ -296,17 +313,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -341,11 +358,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -359,7 +376,7 @@ -e "s:@FLAVOR""@:kdump:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-kdump %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -483,6 +500,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -18,10 +18,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "ppc64" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: Kernel for ppc64 Systems Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Kernel Autoreqprov: on @@ -35,7 +52,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -46,7 +63,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -54,10 +71,10 @@ Obsoletes: kernel-ppc64-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -145,7 +162,7 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -182,7 +199,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -206,7 +223,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=ppc64 SUBARCH=$subarch @@ -301,17 +318,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -346,11 +363,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -364,7 +381,7 @@ -e "s:@FLAVOR""@:ppc64:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-ppc64 %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -488,6 +505,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "s390" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: The Standard Kernel Version: 2.6.20 -Release: 2 +Release: 3 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-s390-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -128,7 +145,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -165,7 +182,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -189,7 +206,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=s390 SUBARCH=$subarch @@ -284,17 +301,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -329,11 +346,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -347,7 +364,7 @@ -e "s:@FLAVOR""@:s390:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-s390 %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -471,6 +488,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -22,7 +22,7 @@ %endif Summary: The Linux Kernel Sources Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: Development/Sources Autoreqprov: off @@ -106,7 +106,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -295,6 +295,19 @@ %files -f kernel-source.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -14,7 +14,7 @@ URL: http://www.kernel.org/ Summary: Kernel Symbol Versions (modversions) Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: Development/Sources Autoreqprov: off @@ -90,7 +90,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep echo "Architecture symbol(s):" %symbols @@ -137,6 +137,19 @@ /lib/modules/*/modules.alias %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "um" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: The User Mode Linux kernel. Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-um-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -136,7 +153,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -173,7 +190,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -197,7 +214,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=um SUBARCH=$subarch @@ -292,17 +309,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -337,11 +354,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -355,7 +372,7 @@ -e "s:@FLAVOR""@:um:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-um %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -479,6 +496,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "vanilla" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: The Standard Kernel - without any SUSE patches Version: 2.6.20 -Release: 3 +Release: 4 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-vanilla-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -148,7 +165,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -185,7 +202,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -209,7 +226,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=vanilla SUBARCH=$subarch @@ -304,17 +321,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -349,11 +366,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -367,7 +384,7 @@ -e "s:@FLAVOR""@:vanilla:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-vanilla %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -491,6 +508,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:00.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:00.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "xen" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: The Xen Kernel Version: 2.6.20 -Release: 1 +Release: 2 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-xen-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -134,7 +151,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -171,7 +188,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -195,7 +212,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=xen SUBARCH=$subarch @@ -290,17 +307,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -335,11 +352,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -353,7 +370,7 @@ -e "s:@FLAVOR""@:xen:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-xen %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -477,6 +494,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ kernel-xenpae.spec ++++++ --- /var/tmp/diff_new_pack.c12591/_old 2007-02-21 19:18:01.000000000 +0100 +++ /var/tmp/diff_new_pack.c12591/_new 2007-02-21 19:18:01.000000000 +0100 @@ -19,10 +19,27 @@ # We don't have build numbers internally %define source_rel %release %endif +# Don't use shell commands in build macros, this won't work outside of rpm %define build_flavor "xenpae" +%define build_kdump 0 +%define build_xen 0 +%define build_um 0 +%define build_vanilla 0 +%if %{build_flavor} == "kdump" +%define build_kdump 1 +%endif +%if %{build_flavor} == "xen" || %{build_flavor} == "xenpae" +%define build_xen 1 +%endif +%if %{build_flavor} == "um" +%define build_um 1 +%endif +%if %{build_flavor} == "vanilla" +%define build_vanilla 1 +%endif Summary: The Xen Kernel with PAE support Version: 2.6.20 -Release: 1 +Release: 2 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -36,7 +53,7 @@ %if ! 0%{?opensuse_bs} BuildRequires: kernel-dummy %endif -%if %build_flavor == "um" +%if %build_um BuildRequires: libpcap xorg-x11-devel %endif %ifarch ia64 @@ -47,7 +64,7 @@ Requires: irqbalance #!BuildIgnore: irqbalance %endif -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen Requires: xen >= xen-3.0.2_09697 #!BuildIgnore: xen %endif @@ -55,10 +72,10 @@ Obsoletes: kernel-xenpae-nongpl Conflicts: apparmor-profiles <= 2.0-34 Conflicts: apparmor-parser <= 2.0-21.1 -%if %build_flavor == "um" +%if %build_um #Conflicts: kernel %else -%if %build_flavor != "xen" && %build_flavor != "xenpae" +%if ! %build_xen Provides: kernel = 2.6.20-%source_rel %endif %endif @@ -131,7 +148,7 @@ -Source Timestamp: 2007/02/16 23:50:54 UTC +Source Timestamp: 2007/02/21 17:00:21 UTC %prep if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then @@ -168,7 +185,7 @@ fi subarch=${1%/*} # Apply the patches needed for this architecture. -%if %build_flavor != "vanilla" +%if ! %build_vanilla for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then echo "*** Patch $patch failed ***" @@ -192,7 +209,7 @@ %endif > .config # We compile for this sub-architecture (i.e., machine architecture): -%if %build_flavor == "um" +%if %build_um cat > ../.rpm-defs <<EOF ARCH=xenpae SUBARCH=$subarch @@ -287,17 +304,17 @@ gzip -9 %buildroot/$vmlinux fi } -%if %build_flavor == "kdump" +%if %build_kdump add_vmlinux chmod 644 %buildroot/boot/vmlinux-$KERNELRELEASE image=vmlinux %else -%if %build_flavor == "um" +%if %build_um add_vmlinux chmod 755 %buildroot/boot/vmlinux-$KERNELRELEASE image=linux %else -%if %build_flavor == "xen" || %build_flavor == "xenpae" +%if %build_xen add_vmlinux --compressed cp -p vmlinuz %buildroot/boot/vmlinuz-$KERNELRELEASE image=vmlinuz @@ -332,11 +349,11 @@ if [ -e init/kerntypes.o ]; then cp init/kerntypes.o %buildroot/boot/Kerntypes-$KERNELRELEASE fi -# end of build_flavor "xen" or "xenpae" +# end of build_xen %endif -# end of build_flavor "um" +# end of build_um %endif -# end of build_flavor "kdump" +# end of build_kdump %endif ( cat %_sourcedir/functions.sh sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \ @@ -350,7 +367,7 @@ -e "s:@FLAVOR""@:xenpae:g" \ %_sourcedir/postun.sh ) > ../postun.sh -%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla" +%if %build_kdump || %build_um || %build_xen || %build_vanilla suffix=-xenpae %endif ln -s $image$suffix %buildroot/boot/$image$suffix @@ -474,6 +491,19 @@ %files -f kernel.files %changelog +* Wed Feb 21 2007 - jblunck@suse.de +- rpm/kernel-binary.spec.in: Use %%build_$flavor macros to avoid typos. +* Wed Feb 21 2007 - trenn@suse.de +- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse - + properly reset mouse on shutdown/suspend. +- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio + bus suspend ports. + Fix suspend to ram (246948). +* Wed Feb 21 2007 - olh@suse.de +- add patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch + remove /proc entry for network devices +* Mon Feb 19 2007 - olh@suse.de +- reenable ipr on iseries * Fri Feb 16 2007 - kkeil@suse.de - patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom checksum misdetection on some notebooks (235315) ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2007-02-17 00:54:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-02-21 18:34:45.000000000 +0100 @@ -1 +1 @@ -2007/02/16 23:50:54 UTC +2007/02/21 17:00:21 UTC ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/iseries64 new/config/powerpc/iseries64 --- old/config/powerpc/iseries64 2007-01-16 22:29:04.000000000 +0100 +++ new/config/powerpc/iseries64 2007-02-20 13:39:56.000000000 +0100 @@ -693,6 +693,9 @@ # CONFIG_SCSI_INIA100 is not set CONFIG_SCSI_STEX=m # CONFIG_SCSI_SYM53C8XX_2 is not set +CONFIG_SCSI_IPR=m +CONFIG_SCSI_IPR_TRACE=y +CONFIG_SCSI_IPR_DUMP=y # CONFIG_SCSI_QLOGIC_1280 is not set # CONFIG_SCSI_QLA_FC is not set CONFIG_SCSI_QLA_ISCSI=m @@ -705,7 +708,57 @@ # # Serial ATA (prod) and Parallel ATA (experimental) drivers # -# CONFIG_ATA is not set +CONFIG_ATA=m +# CONFIG_ATA_NONSTANDARD is not set +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set # # Multi-device support (RAID and LVM) ++++++ kabi.tar.bz2 ++++++ ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch new/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch --- old/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch 2007-02-21 11:20:13.000000000 +0100 @@ -0,0 +1,42 @@ +Subject: remove AVAILABLE_VETH= from /proc/iSeries/config + +All vio devices on legacy iseries are now available via sysfs. +According to google, nothing beside hwinfo uses AVAILABLE_VETH= +So it is safe to remove the line from /proc/iSeries/config and +let everyone use sysfs to discover the configured virtual network interfaces. + + +Signed-off-by: Olaf Hering <olh@suse.de> + +--- + arch/powerpc/platforms/iseries/viopath.c | 3 --- + 1 file changed, 3 deletions(-) + +Index: b/arch/powerpc/platforms/iseries/viopath.c +=================================================================== +--- a/arch/powerpc/platforms/iseries/viopath.c ++++ b/arch/powerpc/platforms/iseries/viopath.c +@@ -113,7 +113,6 @@ static vio_event_handler_t *vio_handler[ + static int proc_viopath_show(struct seq_file *m, void *v) + { + char *buf; +- u16 vlanMap; + dma_addr_t handle; + HvLpEvent_Rc hvrc; + DECLARE_MUTEX_LOCKED(Semaphore); +@@ -141,7 +140,6 @@ static int proc_viopath_show(struct seq_ + + down(&Semaphore); + +- vlanMap = HvLpConfig_getVirtualLanIndexMap(); + + buf[HW_PAGE_SIZE-1] = '\0'; + seq_printf(m, "%s", buf); +@@ -150,7 +148,6 @@ static int proc_viopath_show(struct seq_ + DMA_FROM_DEVICE); + kfree(buf); + +- seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap); + + node = of_find_node_by_path("/"); + sysid = NULL; ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/psmouse-fiddle-with-reset.patch new/patches.fixes/psmouse-fiddle-with-reset.patch --- old/patches.fixes/psmouse-fiddle-with-reset.patch 2007-02-12 16:23:47.000000000 +0100 +++ new/patches.fixes/psmouse-fiddle-with-reset.patch 2007-02-21 18:34:15.000000000 +0100 @@ -1,10 +1,4 @@ Subject: psmouse - properly reset mouse on shutdown/suspend -From: Dmitry Torokhov <dtor@mail.ru> -Patch-mainline: not yet -References: 179702,202389,226069 - -This is my fix extended by the serio mainainter. -Hope it gets mainline soon, after some positive test reports Input: psmouse - properly reset mouse on shutdown/suspend @@ -12,20 +6,22 @@ for suspend to ram/disk to work properly. Let's make port cleanup behave the same way as driver unload. -Signed-off-by: Thomas Renninger <trenn@suse.de> +This fixes "bad state" roblem on various HP laptops, such +as nx7400. +Signed-off-by: Dmitry Torokhov <dtor@mail.ru> --- - drivers/input/mouse/psmouse-base.c | 17 +++++++++++++++++ + drivers/input/mouse/psmouse-base.c | 28 ++++++++++++++++++++++++++++ drivers/input/mouse/psmouse.h | 1 + drivers/input/mouse/synaptics.c | 1 + - 3 files changed, 19 insertions(+) + 3 files changed, 30 insertions(+) Index: work/drivers/input/mouse/psmouse-base.c =================================================================== --- work.orig/drivers/input/mouse/psmouse-base.c +++ work/drivers/input/mouse/psmouse-base.c -@@ -987,8 +987,25 @@ static void psmouse_resync(struct work_s +@@ -987,8 +987,36 @@ static void psmouse_resync(struct work_s static void psmouse_cleanup(struct serio *serio) { struct psmouse *psmouse = serio_get_drvdata(serio); @@ -37,15 +33,26 @@ + parent = serio_get_drvdata(serio->parent); + psmouse_deactivate(parent); + } - ++ + psmouse_deactivate(psmouse); ++ + if (psmouse->cleanup) + psmouse->cleanup(psmouse); + psmouse_reset(psmouse); ++ ++/* ++ * Some boxes, such as HP nx7400, get terribly confused if mouse ++ * is not fully enabled before suspending/shutting down. ++ */ + ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE); + -+ if (parent) ++ if (parent) { ++ if (parent->pt_deactivate) ++ parent->pt_deactivate(parent); ++ + psmouse_activate(parent); ++ } + + mutex_unlock(&psmouse_mutex); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/serio-cleanup-to-bus_2.patch new/patches.fixes/serio-cleanup-to-bus_2.patch --- old/patches.fixes/serio-cleanup-to-bus_2.patch 2007-02-15 14:42:39.000000000 +0100 +++ new/patches.fixes/serio-cleanup-to-bus_2.patch 2007-02-21 18:34:15.000000000 +0100 @@ -3,22 +3,29 @@ Input: i8042 - let serio bus suspend ports Let serio subsystem take care of suspending the ports; concentrate -on suspending/resuming the controller itself. Also make sure that -we suspennding the controller only after we really goting to -suspend, not when we iabout to take memory snapshot. +on suspending/resuming the controller itself. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> --- - drivers/input/serio/i8042.c | 39 +++++++++++++++------------------------ - drivers/input/serio/serio.c | 28 +++++++++++++++++++++++++++- - include/linux/serio.h | 6 ------ - 3 files changed, 42 insertions(+), 31 deletions(-) + drivers/input/serio/i8042.c | 56 ++++++++++++++++++++++---------------------- + drivers/input/serio/serio.c | 36 +++++++++++++++++++++++++++- + include/linux/serio.h | 6 ---- + 3 files changed, 64 insertions(+), 34 deletions(-) -Index: linux/drivers/input/serio/i8042.c +Index: work/drivers/input/serio/i8042.c =================================================================== ---- linux.orig/drivers/input/serio/i8042.c -+++ linux/drivers/input/serio/i8042.c +--- work.orig/drivers/input/serio/i8042.c ++++ work/drivers/input/serio/i8042.c +@@ -724,7 +724,7 @@ static int i8042_controller_init(void) + if (~i8042_read_status() & I8042_STR_KEYLOCK) { + if (i8042_unlock) + i8042_ctr |= I8042_CTR_IGNKEYLOCK; +- else ++ else + printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n"); + } + spin_unlock_irqrestore(&i8042_lock, flags); @@ -791,27 +791,6 @@ static void i8042_controller_reset(void) @@ -47,39 +54,50 @@ * i8042_panic_blink() will flash the keyboard LEDs and is called when * kernel panics. Flashing LEDs is useful for users running X who may * not see the console and will help distingushing panics from "real" -@@ -858,12 +837,15 @@ static long i8042_panic_blink(long count +@@ -857,13 +836,22 @@ static long i8042_panic_blink(long count + #undef DELAY ++#ifdef CONFIG_PM /* - * Here we try to restore the original BIOS settings + * Here we try to restore the original BIOS settings. We only want to -+ * do that once, when we really suspend, not when we need to take a -+ * snapshot. ++ * do that once, when we really suspend, not when we taking memory ++ * snapshot for swsusp (in this case we'll perform required cleanup ++ * as part of shutdown process). */ static int i8042_suspend(struct platform_device *dev, pm_message_t state) { - i8042_controller_cleanup(); -+ if (state.event == PM_EVENT_SUSPEND) -+ i8042_controller_reset(); ++ if (dev->dev.power.power_state.event != state.event) { ++ if (state.event == PM_EVENT_SUSPEND) ++ i8042_controller_reset(); ++ ++ dev->dev.power.power_state = state; ++ } return 0; } -@@ -877,6 +859,12 @@ static int i8042_resume(struct platform_ +@@ -877,6 +865,12 @@ static int i8042_resume(struct platform_ { int error; +/* -+ * Do not bother with restoring state if we haven't really suspened yet ++ * Do not bother with restoring state if we haven't suspened yet + */ -+ if (dev->dev.power.power_state.event != PM_EVENT_SUSPEND) ++ if (dev->dev.power.power_state.event == PM_EVENT_ON) + return 0; + error = i8042_controller_check(); if (error) return error; -@@ -889,6 +877,9 @@ static int i8042_resume(struct platform_ - * Restore pre-resume CTR value and disable all ports +@@ -886,9 +880,12 @@ static int i8042_resume(struct platform_ + return error; + + /* +- * Restore pre-resume CTR value and disable all ports ++ * Restore original CTR value and disable all ports */ + i8042_ctr = i8042_initial_ctr; @@ -88,7 +106,19 @@ i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS; i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT); if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) { -@@ -919,7 +910,7 @@ static int i8042_resume(struct platform_ +@@ -909,8 +906,11 @@ static int i8042_resume(struct platform_ + + i8042_interrupt(0, NULL); + ++ dev->dev.power.power_state = PMSG_ON; ++ + return 0; + } ++#endif /* CONFIG_PM */ + + /* + * We need to reset the 8042 back to original mode on system shutdown, +@@ -919,7 +919,7 @@ static int i8042_resume(struct platform_ static void i8042_shutdown(struct platform_device *dev) { @@ -97,10 +127,23 @@ } static int __devinit i8042_create_kbd_port(void) -Index: linux/drivers/input/serio/serio.c +@@ -1154,9 +1154,11 @@ static struct platform_driver i8042_driv + }, + .probe = i8042_probe, + .remove = __devexit_p(i8042_remove), ++ .shutdown = i8042_shutdown, ++#ifdef CONFIG_PM + .suspend = i8042_suspend, + .resume = i8042_resume, +- .shutdown = i8042_shutdown, ++#endif + }; + + static int __init i8042_init(void) +Index: work/drivers/input/serio/serio.c =================================================================== ---- linux.orig/drivers/input/serio/serio.c -+++ linux/drivers/input/serio/serio.c +--- work.orig/drivers/input/serio/serio.c ++++ work/drivers/input/serio/serio.c @@ -778,6 +778,19 @@ static int serio_driver_remove(struct de return 0; } @@ -121,16 +164,19 @@ static void serio_attach_driver(struct serio_driver *drv) { int error; -@@ -910,11 +923,22 @@ static int serio_uevent(struct device *d +@@ -910,11 +923,25 @@ static int serio_uevent(struct device *d #endif /* CONFIG_HOTPLUG */ ++#ifdef CONFIG_PM +static int serio_suspend(struct device *dev, pm_message_t state) +{ -+ struct serio *serio = to_serio_port(dev); ++ if (dev->power.power_state.event != state.event) { ++ if (state.event == PM_EVENT_SUSPEND) ++ serio_cleanup(to_serio_port(dev)); + -+ if (state.event == PM_EVENT_SUSPEND) -+ serio_cleanup(serio); ++ dev->power.power_state = state; ++ } + + return 0; +} @@ -140,24 +186,39 @@ struct serio *serio = to_serio_port(dev); - if (serio_reconnect_driver(serio)) { -+ if (dev->power.power_state.event == PM_EVENT_SUSPEND && ++ if (dev->power.power_state.event != PM_EVENT_ON && + serio_reconnect_driver(serio)) { /* * Driver re-probing can take a while, so better let kseriod * deal with it. -@@ -974,6 +998,8 @@ static struct bus_type serio_bus = { +@@ -922,8 +949,11 @@ static int serio_resume(struct device *d + serio_rescan(serio); + } + ++ dev->power.power_state = PMSG_ON; ++ + return 0; + } ++#endif /* CONFIG_PM */ + + /* called from serio_driver->connect/disconnect methods under serio_mutex */ + int serio_open(struct serio *serio, struct serio_driver *drv) +@@ -974,7 +1004,11 @@ static struct bus_type serio_bus = { .uevent = serio_uevent, .probe = serio_driver_probe, .remove = serio_driver_remove, + .shutdown = serio_shutdown, ++#ifdef CONFIG_PM + .suspend = serio_suspend, .resume = serio_resume, ++#endif }; -Index: linux/include/linux/serio.h + static int __init serio_init(void) +Index: work/include/linux/serio.h =================================================================== ---- linux.orig/include/linux/serio.h -+++ linux/include/linux/serio.h +--- work.orig/include/linux/serio.h ++++ work/include/linux/serio.h @@ -108,12 +108,6 @@ static inline void serio_drv_write_wakeu serio->drv->write_wakeup(serio); } ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++++ series.conf ++++++ --- kernel-source/series.conf 2007-02-17 00:54:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-02-21 18:34:38.000000000 +0100 @@ -115,6 +115,7 @@ patches.arch/ppc64-xmon-dmesg-printing.patch patches.fixes/ignore-aix-disk-label.patch patches.arch/ppc-pci-fixup_resource.patch + patches.arch/ppc-iseries-remove-AVAILABLE_VETH.patch # KDB v4.4 patches.suse/kdb-common ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de