Hello community,
here is the log from the commit of package kernel-source
checked in at Mon Feb 19 12:31:18 CET 2007.
--------
--- kernel-source/kernel-bigsmp.changes 2007-02-09 07:14:59.000000000 +0100
+++ kernel-source/kernel-bigsmp.changes 2007-02-17 00:54:52.595915000 +0100
@@ -1,0 +2,110 @@
+Fri Feb 16 15:26:54 CET 2007 - kkeil@suse.de
+
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+
+-------------------------------------------------------------------
+Fri Feb 16 00:32:03 CET 2007 - trenn@suse.de
+
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Feb 15 14:41:05 CET 2007 - trenn@suse.de
+
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+
+-------------------------------------------------------------------
+Mon Feb 12 16:23:39 CET 2007 - trenn@suse.de
+
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+
+-------------------------------------------------------------------
+Mon Feb 12 16:18:23 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+
+-------------------------------------------------------------------
+Mon Feb 12 16:14:53 CET 2007 - jbeulich@novell.com
+
+- config.conf: Also enable xenpae.
+
+-------------------------------------------------------------------
+Mon Feb 12 15:46:41 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %symbols macro.
+
+-------------------------------------------------------------------
+Mon Feb 12 15:40:01 CET 2007 - jblunck@suse.de
+
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+
+-------------------------------------------------------------------
+Mon Feb 12 15:32:55 CET 2007 - trenn@suse.de
+
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+
+-------------------------------------------------------------------
+Mon Feb 12 14:44:29 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-binary.spec.in: Introduce %build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+
+-------------------------------------------------------------------
+Mon Feb 12 14:31:59 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+
+-------------------------------------------------------------------
+Mon Feb 12 12:53:43 CET 2007 - jbeulich@novell.com
+
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+
+-------------------------------------------------------------------
+Mon Feb 12 10:10:44 CET 2007 - jbeulich@novell.com
+
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+
+-------------------------------------------------------------------
+Fri Feb 9 13:50:10 CET 2007 - schwab@suse.de
+
+- Update kdb patches.
+
+-------------------------------------------------------------------
+Fri Feb 9 12:12:51 CET 2007 - jblunck@suse.de
+
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
+
+-------------------------------------------------------------------
@@ -684 +794 @@
-------------------------------------------------------------------
+-------------------------------------------------------------------
@@ -689 +799 @@
-------------------------------------------------------------------
+-------------------------------------------------------------------
@@ -2723,0 +2834,6 @@
+Sun Jun 4 14:08:37 CEST 2006 - jack@suse.cz
+
+- patches.fixes/jbd-2.6.16-2-refile_nodirty_fix.diff: Fix
+ assertion failure in journal_write_metadata_buffer() (174813).
+
+-------------------------------------------------------------------
@@ -2736,6 +2851,0 @@
-Sun Jun 4 14:08:37 CEST 2006 - jack@suse.cz
-
-- patches.fixes/jbd-2.6.16-2-refile_nodirty_fix.diff: Fix
- assertion failure in journal_write_metadata_buffer() (174813).
-
--------------------------------------------------------------------
@@ -2916,0 +3027,7 @@
+Thu Jun 1 00:10:01 CEST 2006 - agruen@suse.de
+
+- patches.fixes/xfs-kern-26040a-do-not-dirty-inode-being-freed:
+ Don't dirty the inode if it being freed in xfs_iunpin
+ (179117, SGI:PV952967).
+
+-------------------------------------------------------------------
@@ -2942,7 +3058,0 @@
-Thu Jun 1 00:10:01 CEST 2006 - agruen@suse.de
-
-- patches.fixes/xfs-kern-26040a-do-not-dirty-inode-being-freed:
- Don't dirty the inode if it being freed in xfs_iunpin
- (179117, SGI:PV952967).
-
--------------------------------------------------------------------
@@ -2973,5 +3082,0 @@
-Wed May 31 14:52:49 CEST 2006 - gregkh@suse.de
-
-- Updated supported.conf for new modules
-
--------------------------------------------------------------------
@@ -2985,0 +3091,5 @@
+Wed May 31 14:52:49 CEST 2006 - gregkh@suse.de
+
+- Updated supported.conf for new modules
+
+-------------------------------------------------------------------
@@ -3059,0 +3170,6 @@
+Sat May 27 04:34:05 CEST 2006 - jack@suse.cz
+
+- patches.fixes/jfs-releasepage.patch: JFS: Fix multiple errors
+ in metapage_releasepage (177890).
+
+-------------------------------------------------------------------
@@ -3077,6 +3192,0 @@
-Sat May 27 04:34:05 CEST 2006 - jack@suse.cz
-
-- patches.fixes/jfs-releasepage.patch: JFS: Fix multiple errors
- in metapage_releasepage (177890).
-
--------------------------------------------------------------------
@@ -3099,0 +3210,23 @@
+Tue May 23 18:05:20 CEST 2006 - trenn@suse.de
+
+- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch:
+ Fix for apic initialization bug using kdump (177741).
+
+-------------------------------------------------------------------
+Tue May 23 17:46:10 CEST 2006 - perex@suse.de
+
+- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for
+ bonding (might_sleep) (174843).
+
+-------------------------------------------------------------------
+Tue May 23 17:38:05 CEST 2006 - schwab@suse.de
+
+- iosapic-move-irq: fix broken irq affinity [#176697].
+
+-------------------------------------------------------------------
+Tue May 23 16:11:35 CEST 2006 - ak@suse.de
+
+- patches.arch/x86_64-bad-addr-boundary: Fix off by one in
+ bad_addr checking in find_e820_area (166022).
+
+-------------------------------------------------------------------
@@ -3134,23 +3266,0 @@
++++ 1286 more lines (skipped)
++++ between kernel-source/kernel-bigsmp.changes
++++ and kernel-source/kernel-bigsmp.changes
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
New Changes file:
--- /dev/null 2006-06-16 15:54:00.000000000 +0200
+++ kernel-source/kernel-xen.changes 2007-02-17 00:54:53.655855000 +0100
@@ -0,0 +1,31355 @@
+-------------------------------------------------------------------
+Fri Feb 16 15:26:54 CET 2007 - kkeil@suse.de
+
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+
+-------------------------------------------------------------------
+Fri Feb 16 00:32:03 CET 2007 - trenn@suse.de
+
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Feb 15 14:41:05 CET 2007 - trenn@suse.de
+
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+
+-------------------------------------------------------------------
+Mon Feb 12 16:23:39 CET 2007 - trenn@suse.de
+
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+
+-------------------------------------------------------------------
+Mon Feb 12 16:18:23 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+
+-------------------------------------------------------------------
+Mon Feb 12 16:14:53 CET 2007 - jbeulich@novell.com
+
+- config.conf: Also enable xenpae.
+
+-------------------------------------------------------------------
+Mon Feb 12 15:46:41 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %symbols macro.
+
+-------------------------------------------------------------------
+Mon Feb 12 15:40:01 CET 2007 - jblunck@suse.de
+
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+
+-------------------------------------------------------------------
+Mon Feb 12 15:32:55 CET 2007 - trenn@suse.de
+
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+
+-------------------------------------------------------------------
+Mon Feb 12 14:44:29 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-binary.spec.in: Introduce %build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+
+-------------------------------------------------------------------
+Mon Feb 12 14:31:59 CET 2007 - jblunck@suse.de
+
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+
+-------------------------------------------------------------------
+Mon Feb 12 12:53:43 CET 2007 - jbeulich@novell.com
+
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+
+-------------------------------------------------------------------
+Mon Feb 12 10:10:44 CET 2007 - jbeulich@novell.com
+
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+
+-------------------------------------------------------------------
+Fri Feb 9 13:50:10 CET 2007 - schwab@suse.de
+
+- Update kdb patches.
+
+-------------------------------------------------------------------
+Fri Feb 9 12:12:51 CET 2007 - jblunck@suse.de
+
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
+
+-------------------------------------------------------------------
+Wed Feb 7 22:03:57 CET 2007 - jeffm@suse.de
+
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+
+-------------------------------------------------------------------
+Wed Feb 7 14:53:33 CET 2007 - bwalle@suse.de
+
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+
+-------------------------------------------------------------------
+Tue Feb 6 18:36:17 CET 2007 - gregkh@suse.de
+
+- update to 2.6.20
+
+-------------------------------------------------------------------
+Tue Feb 6 08:16:04 CET 2007 - teheo@suse.de
+
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+
+-------------------------------------------------------------------
+Tue Feb 6 01:46:49 CET 2007 - jjohanse@suse.de
+
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ #239147, #221567, #240982, #218961, #219309
+
+-------------------------------------------------------------------
+Mon Feb 5 16:03:07 CET 2007 - jbeulich@novell.com
+
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
+
+-------------------------------------------------------------------
+Thu Feb 1 14:34:09 CET 2007 - olh@suse.de
+
+- update to 2.6.20-rc7
+
+-------------------------------------------------------------------
+Wed Jan 31 11:22:30 CET 2007 - bwalle@suse.de
+
+- patches.suse/dynamic-kernel-command-line-alpha.patch,
+ patches.suse/dynamic-kernel-command-line-arm.patch,
+ patches.suse/dynamic-kernel-command-line-arm26.patch,
+ patches.suse/dynamic-kernel-command-line-avr32.patch,
+ patches.suse/dynamic-kernel-command-line-common.patch,=20
+ patches.suse/dynamic-kernel-command-line-cris.patch,
+ patches.suse/dynamic-kernel-command-line-fixups.patch,
+ patches.suse/dynamic-kernel-command-line-frv.patch,
+ patches.suse/dynamic-kernel-command-line-h8300.patch,
+ patches.suse/dynamic-kernel-command-line-i386.patch,
+ patches.suse/dynamic-kernel-command-line-ia64-fix.patch,
+ patches.suse/dynamic-kernel-command-line-ia64.patch,
+ patches.suse/dynamic-kernel-command-line-m32r.patch,
+ patches.suse/dynamic-kernel-command-line-m68k.patch,
+ patches.suse/dynamic-kernel-command-line-m68knommu.patch,
+ patches.suse/dynamic-kernel-command-line-mips.patch,
+ patches.suse/dynamic-kernel-command-line-parisc.patch,
+ patches.suse/dynamic-kernel-command-line-powerpc.patch,
+ patches.suse/dynamic-kernel-command-line-ppc.patch,
+ patches.suse/dynamic-kernel-command-line-s390.patch,
+ patches.suse/dynamic-kernel-command-line-sh.patch,
+ patches.suse/dynamic-kernel-command-line-sh64.patch,
+ patches.suse/dynamic-kernel-command-line-sparc.patch,
++++ 31158 more lines (skipped)
++++ between /dev/null
++++ and kernel-source/kernel-xen.changes
New Changes file:
kernel-xenpae.changes: same change
New:
----
kernel-xen.changes
kernel-xen.spec
kernel-xenpae.changes
kernel-xenpae.spec
needed_space_in_mb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,41 +19,51 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ bigsmp != kdump ] ; echo $?)
-%define build_xen %(case bigsmp in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ bigsmp != um ] ; echo $?)
-%define build_vanilla %([ bigsmp != vanilla ] ; echo $?)
-BuildRequires: kernel-dummy
-%ifarch ia64
-# arch/ia64/scripts/unwcheck.py
-BuildRequires: python
-%endif
-Version: 2.6.20
-Release: 1
+%define build_flavor "bigsmp"
Summary: Kernel with PAE Support
+Version: 2.6.20
+Release: 3
License: GNU General Public License (GPL)
Group: System/Kernel
-%if %build_um
-#Conflicts: kernel
-%else
-%if !%build_xen
-Provides: kernel = 2.6.20-%source_rel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
+BuildRequires: kernel-dummy
%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
+%ifarch ia64
+# arch/ia64/scripts/unwcheck.py
+BuildRequires: python
%endif
-Provides: kernel-bigsmp-nongpl
-Obsoletes: kernel-bigsmp-nongpl
-Provides: k_smp4G
-Obsoletes: k_smp4G
%ifarch %ix86 x86_64
Requires: irqbalance
+#!BuildIgnore: irqbalance
%endif
-%if %build_xen
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
%endif
+Provides: kernel-bigsmp-nongpl
+Obsoletes: kernel-bigsmp-nongpl
Conflicts: apparmor-profiles <= 2.0-34
Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
+%if %build_flavor == "um"
+#Conflicts: kernel
+%else
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
+Provides: kernel = 2.6.20-%source_rel
+%endif
+%endif
+Provides: k_smp4G
+Obsoletes: k_smp4G
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -85,15 +95,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86
# These files are found in the kernel-source package:
@@ -109,6 +111,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-bigsmp $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -118,8 +123,6 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
@@ -127,7 +130,7 @@
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -135,21 +138,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-bigsmp
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -161,7 +158,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = bigsmp ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -170,15 +167,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -188,10 +185,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.bigsmp
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-bigsmp
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -473,7 +472,72 @@
%files -f kernel.files
-%changelog -n kernel-bigsmp
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,29 +19,49 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ debug != kdump ] ; echo $?)
-%define build_xen %(case debug in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ debug != um ] ; echo $?)
-%define build_vanilla %([ debug != vanilla ] ; echo $?)
+%define build_flavor "debug"
+Summary: A Debug Version of the Kernel
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
+Group: System/Kernel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy
+%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20
-Release: 1
-Summary: A Debug Version of the Kernel
-License: GNU General Public License (GPL)
-Group: System/Kernel
-%if %build_um
+%ifarch %ix86 x86_64
+Requires: irqbalance
+#!BuildIgnore: irqbalance
+%endif
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
+Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
+%endif
+Provides: kernel-debug-nongpl
+Obsoletes: kernel-debug-nongpl
+Conflicts: apparmor-profiles <= 2.0-34
+Conflicts: apparmor-parser <= 2.0-21.1
+%if %build_flavor == "um"
#Conflicts: kernel
%else
-%if !%build_xen
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
Provides: kernel = 2.6.20-%source_rel
%endif
%endif
-Provides: kernel-debug-nongpl
-Obsoletes: kernel-debug-nongpl
%ifarch %ix86
%else
%ifarch ia64
@@ -50,16 +70,6 @@
%endif
%endif
%endif
-%ifarch %ix86 x86_64
-Requires: irqbalance
-%endif
-%if %build_xen
-Requires: xen >= xen-3.0.2_09697
-%endif
-Conflicts: apparmor-profiles <= 2.0-34
-Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -91,15 +101,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64
# These files are found in the kernel-source package:
@@ -115,6 +117,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-debug $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -124,15 +129,13 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
This kernel has several debug facilities enabled that hurt performance.
Only use this kernel when investigating problems.
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -140,21 +143,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-debug
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -166,7 +163,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = debug ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -175,15 +172,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -193,10 +190,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.debug
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-debug
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -478,7 +477,72 @@
%files -f kernel.files
-%changelog -n kernel-debug
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,29 +19,49 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ default != kdump ] ; echo $?)
-%define build_xen %(case default in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ default != um ] ; echo $?)
-%define build_vanilla %([ default != vanilla ] ; echo $?)
+%define build_flavor "default"
+Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
+Group: System/Kernel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy
+%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20
-Release: 1
-Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
-License: GNU General Public License (GPL)
-Group: System/Kernel
-%if %build_um
+%ifarch %ix86 x86_64
+Requires: irqbalance
+#!BuildIgnore: irqbalance
+%endif
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
+Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
+%endif
+Provides: kernel-default-nongpl
+Obsoletes: kernel-default-nongpl
+Conflicts: apparmor-profiles <= 2.0-34
+Conflicts: apparmor-parser <= 2.0-21.1
+%if %build_flavor == "um"
#Conflicts: kernel
%else
-%if !%build_xen
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
Provides: kernel = 2.6.20-%source_rel
%endif
%endif
-Provides: kernel-default-nongpl
-Obsoletes: kernel-default-nongpl
%ifarch alpha
%else
%ifarch %ix86
@@ -72,16 +92,6 @@
%endif
%endif
%endif
-%ifarch %ix86 x86_64
-Requires: irqbalance
-%endif
-%if %build_xen
-Requires: xen >= xen-3.0.2_09697
-%endif
-Conflicts: apparmor-profiles <= 2.0-34
-Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -113,15 +123,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: alpha %ix86 ia64 ppc ppc64 s390x x86_64
# These files are found in the kernel-source package:
@@ -137,6 +139,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-default $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -146,14 +151,12 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
The standard kernel for both uniprocessor and multiprocessor systems.
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -161,21 +164,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-default
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -187,7 +184,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = default ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -196,15 +193,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -214,10 +211,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.default
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-default
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -499,7 +498,72 @@
%files -f kernel.files
-%changelog -n kernel-default
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -9,15 +9,16 @@
#
# norootforbuild
+# icecream 0
Name: kernel-dummy
URL: http://www.kernel.org/
-License: GNU General Public License (GPL)
-Autoreqprov: off
Summary: Internal dummy package for synchronizing release numbers
-Group: System/Kernel
Version: 2.6.20
-Release: 1
+Release: 3
+License: GNU General Public License (GPL)
+Group: System/Kernel
+Autoreqprov: off
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -27,7 +28,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%install
@@ -39,7 +40,72 @@
%defattr(-, root, root)
/etc/dummy
-%changelog -n kernel-dummy
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,44 +19,54 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ iseries64 != kdump ] ; echo $?)
-%define build_xen %(case iseries64 in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ iseries64 != um ] ; echo $?)
-%define build_vanilla %([ iseries64 != vanilla ] ; echo $?)
+%define build_flavor "iseries64"
+Summary: 64-Bit Kernel for iSeries
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
+Group: System/Kernel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy
+%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20
-Release: 1
-Summary: 64-Bit Kernel for iSeries
-License: GNU General Public License (GPL)
-Group: System/Kernel
-%if %build_um
+%ifarch %ix86 x86_64
+Requires: irqbalance
+#!BuildIgnore: irqbalance
+%endif
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
+Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
+%endif
+Provides: kernel-iseries64-nongpl
+Obsoletes: kernel-iseries64-nongpl
+Conflicts: apparmor-profiles <= 2.0-34
+Conflicts: apparmor-parser <= 2.0-21.1
+%if %build_flavor == "um"
#Conflicts: kernel
%else
-%if !%build_xen
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
Provides: kernel = 2.6.20-%source_rel
%endif
%endif
-Provides: kernel-iseries64-nongpl
-Obsoletes: kernel-iseries64-nongpl
%ifarch ppc
%else
%ifarch ppc64
%endif
%endif
-%ifarch %ix86 x86_64
-Requires: irqbalance
-%endif
-%if %build_xen
-Requires: xen >= xen-3.0.2_09697
-%endif
-Conflicts: apparmor-profiles <= 2.0-34
-Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -88,15 +98,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64
# These files are found in the kernel-source package:
@@ -112,6 +114,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-iseries64 $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -121,14 +126,12 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
Standard 64-bit kernel for legacy IBM iSeries machines.
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -136,21 +139,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-iseries64
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -162,7 +159,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = iseries64 ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -171,15 +168,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -189,10 +186,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.iseries64
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-iseries64
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -474,7 +473,72 @@
%files -f kernel.files
-%changelog -n kernel-iseries64
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,29 +19,49 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ kdump != kdump ] ; echo $?)
-%define build_xen %(case kdump in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ kdump != um ] ; echo $?)
-%define build_vanilla %([ kdump != vanilla ] ; echo $?)
+%define build_flavor "kdump"
+Summary: kernel for kdump
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
+Group: System/Kernel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy
+%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20
-Release: 1
-Summary: kernel for kdump
-License: GNU General Public License (GPL)
-Group: System/Kernel
-%if %build_um
+%ifarch %ix86 x86_64
+Requires: irqbalance
+#!BuildIgnore: irqbalance
+%endif
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
+Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
+%endif
+Provides: kernel-kdump-nongpl
+Obsoletes: kernel-kdump-nongpl
+Conflicts: apparmor-profiles <= 2.0-34
+Conflicts: apparmor-parser <= 2.0-21.1
+%if %build_flavor == "um"
#Conflicts: kernel
%else
-%if !%build_xen
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
Provides: kernel = 2.6.20-%source_rel
%endif
%endif
-Provides: kernel-kdump-nongpl
-Obsoletes: kernel-kdump-nongpl
%ifarch %ix86
%else
%ifarch ppc
@@ -53,16 +73,6 @@
%endif
%endif
%endif
-%ifarch %ix86 x86_64
-Requires: irqbalance
-%endif
-%if %build_xen
-Requires: xen >= xen-3.0.2_09697
-%endif
-Conflicts: apparmor-profiles <= 2.0-34
-Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -94,15 +104,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ppc ppc64 x86_64
# These files are found in the kernel-source package:
@@ -118,6 +120,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-kdump $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -127,8 +132,6 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
This kernel is intended for kdump. It can not be booted with a normal
bootloader, the kexec tool has to be used to load it. Once the system
@@ -137,7 +140,7 @@
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -145,21 +148,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-kdump
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -171,7 +168,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = kdump ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -180,15 +177,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -198,10 +195,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.kdump
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-kdump
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -483,7 +482,72 @@
%files -f kernel.files
-%changelog -n kernel-kdump
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -18,29 +18,49 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ ppc64 != kdump ] ; echo $?)
-%define build_xen %(case ppc64 in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ ppc64 != um ] ; echo $?)
-%define build_vanilla %([ ppc64 != vanilla ] ; echo $?)
+%define build_flavor "ppc64"
+Summary: Kernel for ppc64 Systems
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+Group: System/Kernel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy
+%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20
-Release: 1
-Summary: Kernel for ppc64 Systems
-License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
-Group: System/Kernel
-%if %build_um
+%ifarch %ix86 x86_64
+Requires: irqbalance
+#!BuildIgnore: irqbalance
+%endif
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
+Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
+%endif
+Provides: kernel-ppc64-nongpl
+Obsoletes: kernel-ppc64-nongpl
+Conflicts: apparmor-profiles <= 2.0-34
+Conflicts: apparmor-parser <= 2.0-21.1
+%if %build_flavor == "um"
#Conflicts: kernel
%else
-%if !%build_xen
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
Provides: kernel = 2.6.20-%source_rel
%endif
%endif
-Provides: kernel-ppc64-nongpl
-Obsoletes: kernel-ppc64-nongpl
%ifarch ppc
Provides: kernel-pmac64 kernel-pseries64
Obsoletes: kernel-pmac64 kernel-pseries64
@@ -48,16 +68,6 @@
%ifarch ppc64
%endif
%endif
-%ifarch %ix86 x86_64
-Requires: irqbalance
-%endif
-%if %build_xen
-Requires: xen >= xen-3.0.2_09697
-%endif
-Conflicts: apparmor-profiles <= 2.0-34
-Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -89,15 +99,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64
# These files are found in the kernel-source package:
@@ -113,6 +115,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-ppc64 $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -122,8 +127,6 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
This package contains the kernel for:
@@ -142,7 +145,7 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -150,21 +153,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-ppc64
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -176,7 +173,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = ppc64 ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -185,15 +182,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -203,10 +200,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.ppc64
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-ppc64
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -488,7 +487,72 @@
%files -f kernel.files
-%changelog -n kernel-ppc64
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,41 +19,51 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ s390 != kdump ] ; echo $?)
-%define build_xen %(case s390 in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ s390 != um ] ; echo $?)
-%define build_vanilla %([ s390 != vanilla ] ; echo $?)
-BuildRequires: kernel-dummy
-%ifarch ia64
-# arch/ia64/scripts/unwcheck.py
-BuildRequires: python
-%endif
-Version: 2.6.20
-Release: 1
+%define build_flavor "s390"
Summary: The Standard Kernel
+Version: 2.6.20
+Release: 2
License: GNU General Public License (GPL)
Group: System/Kernel
-%if %build_um
-#Conflicts: kernel
-%else
-%if !%build_xen
-Provides: kernel = 2.6.20-%source_rel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
+BuildRequires: kernel-dummy
%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
+%ifarch ia64
+# arch/ia64/scripts/unwcheck.py
+BuildRequires: python
%endif
-Provides: kernel-s390-nongpl
-Obsoletes: kernel-s390-nongpl
-Provides: kernel-32bit k_deflt
-Obsoletes: kernel-32bit k_deflt
%ifarch %ix86 x86_64
Requires: irqbalance
+#!BuildIgnore: irqbalance
%endif
-%if %build_xen
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
%endif
+Provides: kernel-s390-nongpl
+Obsoletes: kernel-s390-nongpl
Conflicts: apparmor-profiles <= 2.0-34
Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
+%if %build_flavor == "um"
+#Conflicts: kernel
+%else
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
+Provides: kernel = 2.6.20-%source_rel
+%endif
+%endif
+Provides: kernel-32bit k_deflt
+Obsoletes: kernel-32bit k_deflt
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -85,15 +95,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390
# These files are found in the kernel-source package:
@@ -109,6 +111,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-s390 $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -118,14 +123,12 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
The standard kernel.
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -133,21 +136,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-s390
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -159,7 +156,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = s390 ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -168,15 +165,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -186,10 +183,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.s390
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-s390
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -471,7 +470,72 @@
%files -f kernel.files
-%changelog -n kernel-s390
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -20,19 +20,23 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-BuildRequires: kernel-dummy
-License: GNU General Public License (GPL)
-Provides: linux
-Autoreqprov: off
Summary: The Linux Kernel Sources
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
Group: Development/Sources
+Autoreqprov: off
+BuildRequires: coreutils
+Requires(post): insserv
+Requires(post): /etc/rc.status
+%if ! 0%{?opensuse_bs}
+BuildRequires: kernel-dummy
+%endif
+Provides: linux
%if "kernel-source" == "kernel-source"
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
-PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
-Version: 2.6.20
-Release: 1
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source2: source-post.sh
@@ -69,6 +73,8 @@
Source57: kernel-s390.spec
Source58: kernel-um.spec
Source59: kernel-vanilla.spec
+Source60: kernel-xen.spec
+Source61: kernel-xenpae.spec
Source100: config.tar.bz2
Source101: patches.arch.tar.bz2
Source102: patches.drivers.tar.bz2
@@ -85,8 +91,8 @@
Prefix: /usr/src
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo $*)
%define preconf 1
-%define symbols %(export PATCH_ARCH=%_target_cpu ; cd %_sourcedir ; set -- $(./arch-symbols) $([ -e extra-symbols ] && cat extra-symbols) ; echo $*)
%define tolerate_unknown_new_config_options 0
%description
@@ -100,7 +106,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -135,7 +141,7 @@
KERNELRELEASE=2.6.20-%source_rel
cat > %_builddir/%{name}-%{version}/.rpm-defs <http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -12,9 +12,18 @@
Name: kernel-syms
URL: http://www.kernel.org/
+Summary: Kernel Symbol Versions (modversions)
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
+Group: Development/Sources
+Autoreqprov: off
+BuildRequires: coreutils
+%if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy
+%endif
%ifarch %ix86
-BuildRequires: kernel-bigsmp kernel-debug kernel-default kernel-kdump kernel-um kernel-vanilla
+BuildRequires: kernel-bigsmp kernel-debug kernel-default kernel-kdump kernel-um kernel-vanilla kernel-xen kernel-xenpae
%else
%ifarch ppc
BuildRequires: kernel-default kernel-iseries64 kernel-kdump kernel-ppc64 kernel-vanilla
@@ -32,7 +41,7 @@
BuildRequires: kernel-debug kernel-default kernel-vanilla
%else
%ifarch x86_64
-BuildRequires: kernel-debug kernel-default kernel-kdump kernel-um kernel-vanilla
+BuildRequires: kernel-debug kernel-default kernel-kdump kernel-um kernel-vanilla kernel-xen
%else
%ifarch alpha
BuildRequires: kernel-default kernel-vanilla
@@ -47,12 +56,6 @@
# the packages above do require other things, but none of those are needed during package build
#!BuildIgnore: irqbalance xen
#!BuildIgnore: perl-Bootloader mkinitrd
-License: GNU General Public License (GPL)
-Autoreqprov: off
-Summary: Kernel Symbol Versions (modversions)
-Group: Development/Sources
-Version: 2.6.20
-Release: 1
Requires: linux
Requires: kernel-source = 2.6.20-%release
Source11: arch-symbols
@@ -61,9 +64,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr/src
-%(chmod +x %_sourcedir/arch-symbols)
+%(chmod +x %_sourcedir/{arch-symbols,guards})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo $*)
%define preconf 1
-%define symbols %(export PATCH_ARCH=%_target_cpu ; cd %_sourcedir ; set -- $(./arch-symbols) $([ -e extra-symbols ] && cat extra-symbols) ; echo $*)
%description
Kernel symbols, such as functions and variables, have version
@@ -87,8 +90,10 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
+%prep
+echo "Architecture symbol(s):" %symbols
%install
# skip long-running sanity checks
@@ -131,7 +136,72 @@
/boot/symsets-*-*.tar.gz
/lib/modules/*/modules.alias
-%changelog -n kernel-syms
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,29 +19,49 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ um != kdump ] ; echo $?)
-%define build_xen %(case um in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ um != um ] ; echo $?)
-%define build_vanilla %([ um != vanilla ] ; echo $?)
-BuildRequires: kernel-dummy libpcap xorg-x11-devel
+%define build_flavor "um"
+Summary: The User Mode Linux kernel.
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
+Group: System/Kernel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
+BuildRequires: kernel-dummy
+%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20
-Release: 1
-Summary: The User Mode Linux kernel.
-License: GNU General Public License (GPL)
-Group: System/Kernel
-%if %build_um
+%ifarch %ix86 x86_64
+Requires: irqbalance
+#!BuildIgnore: irqbalance
+%endif
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
+Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
+%endif
+Provides: kernel-um-nongpl
+Obsoletes: kernel-um-nongpl
+Conflicts: apparmor-profiles <= 2.0-34
+Conflicts: apparmor-parser <= 2.0-21.1
+%if %build_flavor == "um"
#Conflicts: kernel
%else
-%if !%build_xen
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
Provides: kernel = 2.6.20-%source_rel
%endif
%endif
-Provides: kernel-um-nongpl
-Obsoletes: kernel-um-nongpl
%ifarch %ix86
Provides: k_um
Obsoletes: k_um
@@ -49,16 +69,6 @@
%ifarch x86_64
%endif
%endif
-%ifarch %ix86 x86_64
-Requires: irqbalance
-%endif
-%if %build_xen
-Requires: xen >= xen-3.0.2_09697
-%endif
-Conflicts: apparmor-profiles <= 2.0-34
-Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -90,15 +100,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
# These files are found in the kernel-source package:
@@ -114,6 +116,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-um $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -123,8 +128,6 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
The User Mode Linux kernel.
@@ -133,7 +136,7 @@
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -141,21 +144,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-um
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -167,7 +164,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = um ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -176,15 +173,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -194,10 +191,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.um
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-um
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -479,7 +478,72 @@
%files -f kernel.files
-%changelog -n kernel-um
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.Ac2042/_old 2007-02-19 12:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Ac2042/_new 2007-02-19 12:22:25.000000000 +0100
@@ -19,29 +19,49 @@
# We don't have build numbers internally
%define source_rel %release
%endif
-%define build_kdump %([ vanilla != kdump ] ; echo $?)
-%define build_xen %(case vanilla in (xen*) echo 1;; (*) echo 0;; esac)
-%define build_um %([ vanilla != um ] ; echo $?)
-%define build_vanilla %([ vanilla != vanilla ] ; echo $?)
+%define build_flavor "vanilla"
+Summary: The Standard Kernel - without any SUSE patches
+Version: 2.6.20
+Release: 3
+License: GNU General Public License (GPL)
+Group: System/Kernel
+Autoreqprov: on
+BuildRequires: coreutils
+Requires(post): module-init-tools
+Requires(post): /sbin/depmod
+Requires(post): perl-Bootloader >= 0.4.1
+Requires(post): /sbin/update-bootloader
+Requires(post): mkinitrd >= 1.2
+#!BuildIgnore: perl-Bootloader mkinitrd
+%if ! 0%{?opensuse_bs}
BuildRequires: kernel-dummy
+%endif
+%if %build_flavor == "um"
+BuildRequires: libpcap xorg-x11-devel
+%endif
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20
-Release: 1
-Summary: The Standard Kernel - without any SUSE patches
-License: GNU General Public License (GPL)
-Group: System/Kernel
-%if %build_um
+%ifarch %ix86 x86_64
+Requires: irqbalance
+#!BuildIgnore: irqbalance
+%endif
+%if %build_flavor == "xen" || %build_flavor == "xenpae"
+Requires: xen >= xen-3.0.2_09697
+#!BuildIgnore: xen
+%endif
+Provides: kernel-vanilla-nongpl
+Obsoletes: kernel-vanilla-nongpl
+Conflicts: apparmor-profiles <= 2.0-34
+Conflicts: apparmor-parser <= 2.0-21.1
+%if %build_flavor == "um"
#Conflicts: kernel
%else
-%if !%build_xen
+%if %build_flavor != "xen" && %build_flavor != "xenpae"
Provides: kernel = 2.6.20-%source_rel
%endif
%endif
-Provides: kernel-vanilla-nongpl
-Obsoletes: kernel-vanilla-nongpl
%ifarch alpha
%else
%ifarch %ix86
@@ -64,16 +84,6 @@
%endif
%endif
%endif
-%ifarch %ix86 x86_64
-Requires: irqbalance
-%endif
-%if %build_xen
-Requires: xen >= xen-3.0.2_09697
-%endif
-Conflicts: apparmor-profiles <= 2.0-34
-Conflicts: apparmor-parser <= 2.0-21.1
-Autoreqprov: on
-%define my_builddir %_builddir/%{name}-%{version}
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
@@ -105,15 +115,7 @@
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source120: kabi.tar.bz2
-Requires: coreutils
-Requires: rpm
-Requires: module-init-tools
-Requires: /sbin/depmod
-Requires(post): perl-Bootloader >= 0.4.1
-Requires(post): /sbin/update-bootloader
-Requires(post): mkinitrd >= 1.2
-#!BuildIgnore: irqbalance xen
-#!BuildIgnore: perl-Bootloader mkinitrd
+%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: alpha %ix86 ia64 ppc ppc64 s390x x86_64
# These files are found in the kernel-source package:
@@ -129,6 +131,9 @@
NoSource: 108
NoSource: 109
NoSource: 120
+
+%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
+%define symbols %(set -- $(%_sourcedir/arch-symbols %_target_cpu) $([ -e extra-symbols ] && cat extra-symbols) ; echo kernel-vanilla $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -138,14 +143,12 @@
# see scripts/kabi-checks)
%define tolerate_kabi_changes 6
-%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-
%description
The standard kernel - without any SUSE patches
-Source Timestamp: 2007/02/07 21:04:19 UTC
+Source Timestamp: 2007/02/16 23:50:54 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
@@ -153,21 +156,15 @@
"complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
-symbols=$(
- echo kernel-vanilla
- cd %_sourcedir
- PATCH_ARCH=%_target_cpu ./arch-symbols
- ! [ -e extra-symbols ] || cat extra-symbols
-)
-echo "Architecture symbol(s):" $symbols
+echo "Architecture symbol(s):" %symbols
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 120
# Generate the list of supported modules
-( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
+( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
for how in external; do
- ( %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols < %_sourcedir/supported.conf
- %_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
+ ( %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols < %_sourcedir/supported.conf
+ %_sourcedir/guards %symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
@@ -179,7 +176,7 @@
# an architecture different from %arch. The location of the config file
# tells us for which architecture to compile.
set -- $(
- for config in $(%_sourcedir/guards $symbols < %_sourcedir/config.conf) ; do
+ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
[ ${config#*/} = vanilla ] && echo $config
done)
if [ $# -ne 1 ]; then
@@ -188,15 +185,15 @@
fi
subarch=${1%/*}
# Apply the patches needed for this architecture.
-%if !%build_vanilla
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf); do
+%if %build_flavor != "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 ***"
exit 1
fi
done
%else
-for patch in $(%_sourcedir/guards $symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
+for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf | egrep kernel.org\|rpmify); do
if ! patch -s -E -p1 --no-backup-if-mismatch -i ../$patch; then
echo "*** Patch $patch failed ***"
exit 1
@@ -206,10 +203,13 @@
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
config=arch/$subarch/defconfig.vanilla
-
-%_sourcedir/config-subst CONFIG_DEBUG_INFO y < $config > .config
+cat $config \
+%if 0%{?__debug_package:1}
+ | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+%endif
+ > .config
# We compile for this sub-architecture (i.e., machine architecture):
-%if %build_um
+%if %build_flavor == "um"
cat > ../.rpm-defs < ../postun.sh
-%if %build_kdump || %build_um || %build_xen || %build_vanilla
+%if %build_flavor == "kdump" || %build_flavor == "xen" || %build_flavor == "xenpae" || %build_flavor == "vanilla"
suffix=-vanilla
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
@@ -491,7 +490,72 @@
%files -f kernel.files
-%changelog -n kernel-vanilla
+%changelog
+* Fri Feb 16 2007 - kkeil@suse.de
+- patches.drivers/e1000-eeprom-cksum.patch: Fix bad eeprom
+ checksum misdetection on some notebooks (235315)
+* Fri Feb 16 2007 - trenn@suse.de
+- patches.fixes/cpufreq_speedstep_acpi_nodefault.patch:
+- Update config files.
+* Thu Feb 15 2007 - trenn@suse.de
+- patches.fixes/serio-cleanup-to-bus.patch: Delete.
+- patches.fixes/serio-cleanup-to-bus_2.patch: i8042 - let serio
+ bus suspend ports.
+- patches.fixes/acpi-power-resources-resume-fix-2.patch:
+ fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52).
+- patches.fixes/acpi_fan-problem-fix.patch: fix fans on HP laptops
+ (http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8).
+- patches.fixes/acpi_force-fan-active.patch: Always activate
+ fan if it should be active, don't trust former values (239101).
+- patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch: Read DSDT
+ from initrd or initramfs.
+ Adjust patch to 2.6.20, rootfs must be populated even earlier...
+* Mon Feb 12 2007 - trenn@suse.de
+- patches.fixes/acpi_execute_notify_threaded.patch: Acpi:
+ created a dedicated workqueue for notify() execution
+ (http://bugzilla.kernel.org/show_bug.cgi?id=5534).
+- patches.fixes/psmouse-fiddle-with-reset.patch: psmouse -
+ properly reset mouse on shutdown/suspend (179702,202389,226069).
+- patches.fixes/serio-cleanup-to-bus.patch:
+ (179702,202389,226069).
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-syms.spec.in: make guards executable.
+- scripts/cvs-wd-timestamp: add support for local CVS repos.
+- scripts/newest-timestamp: new helper script for removed dirs in CVS.
+- scripts/tar-up.sh: call newest-timestamp on kabi before creating the tarball.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- config.conf: Also enable xenpae.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-{binary,source,syms}.spec.in: synchronize and fix the
+ %%symbols macro.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/{kernel-dummy.spec.in,kernel-source.spec.in,kernel-syms.spec.in,
+ kernel-binary.spec.in}: Specfile cleanup. PreReq: and Requires: are the
+ same now. Added some Requirements(post):. Kernel packages in the OpenSUSE
+ build service don't require kernel-dummy.
+- scripts/tar-up.sh: Removed @EXTRA_NEEDS@ and added BuildRequires instead.
+* Mon Feb 12 2007 - trenn@suse.de
+- Update config files.
+ Remove deprecated CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI (#241987)
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Introduce %%build_flavor and use string
+ comparison since we can't use subshells in build requirement resolving.
+* Mon Feb 12 2007 - jblunck@suse.de
+- rpm/kernel-binary.spec.in: Revert the unconditional compilation with
+ debuginfo.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- patches.xen/xen-x86-no-lapic: Adjust for x86-64 build to succeed.
+* Mon Feb 12 2007 - jbeulich@novell.com
+- update Xen patches to -unstable c/s 13816.
+- Update config files.
+- config.conf: Re-enable xen flavors (xenpae not yet)
+- supported.conf: Adjust Xen modules.
+* Fri Feb 09 2007 - schwab@suse.de
+- Update kdb patches.
+* Fri Feb 09 2007 - jblunck@suse.de
+- kernel-source.changes, kernel-source.changes.old: reorder the changes
+ files to be in descending chronological order.
* Wed Feb 07 2007 - jeffm@suse.de
- patches.fixes/fix-key-serial-number-collision-handling.diff:
keys: Fix key serial number collision handling (243003).
++++++ kernel-xen.spec ++++++
++++ 17082 lines (skipped)
kernel-xenpae.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2007-02-09 07:14:56.000000000 +0100
+++ kernel-source/build-source-timestamp 2007-02-17 00:54:45.028489000 +0100
@@ -1 +1 @@
-2007/02/07 21:04:19 UTC
+2007/02/16 23:50:54 UTC
++++++ config.conf ++++++
--- kernel-source/config.conf 2007-02-09 07:15:00.000000000 +0100
+++ kernel-source/config.conf 2007-02-17 00:54:55.174334000 +0100
@@ -5,8 +5,8 @@
+IA32 i386/bigsmp
+IA32 i386/debug
+IA32 i386/um
-#+IA32 i386/xen
-#+IA32 i386/xenpae
++IA32 i386/xen
++IA32 i386/xenpae
+IA32 i386/kdump
+IA32 i386/vanilla
@@ -16,7 +16,7 @@
+x86_64 x86_64/default
+x86_64 x86_64/um
-#+x86_64 x86_64/xen
++x86_64 x86_64/xen
+x86_64 x86_64/debug
+x86_64 x86_64/kdump
+x86_64 x86_64/vanilla
++++++ config.tar.bz2 ++++++
++++ 10735 lines of diff (skipped)
++++++ 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-pci-fixup_resource.patch new/patches.arch/ppc-pci-fixup_resource.patch
--- old/patches.arch/ppc-pci-fixup_resource.patch 2007-01-13 11:00:22.000000000 +0100
+++ new/patches.arch/ppc-pci-fixup_resource.patch 2007-02-17 00:54:28.000000000 +0100
@@ -1,6 +1,7 @@
Subject: mark pci resources with start 0 as unassigned
From: olh@suse.de
References: 159235 - LTC22345
+Patch-mainline: yes
libata calls pci_request_regions to claim bar 0 - 5
bar 5 has base 0.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-via-pmu-acpower.patch new/patches.arch/ppc-via-pmu-acpower.patch
--- old/patches.arch/ppc-via-pmu-acpower.patch 2007-01-13 11:00:22.000000000 +0100
+++ new/patches.arch/ppc-via-pmu-acpower.patch 2007-02-17 00:54:28.000000000 +0100
@@ -1,6 +1,7 @@
Date: Sat, 30 Sep 2006 17:25:30 +0200
From: Olaf Hering
Subject: [PATCH] AC power not detected if no battery present
+Patch-mainline: yes
/proc/pmu/info contains AC Power: 0 when booting without battery.
Force AC Power, it will be updated whenever the battery state changes.
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/e1000-eeprom-cksum.patch new/patches.drivers/e1000-eeprom-cksum.patch
--- old/patches.drivers/e1000-eeprom-cksum.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/e1000-eeprom-cksum.patch 2007-02-16 15:30:46.000000000 +0100
@@ -0,0 +1,27 @@
+From: Karsten Keil
+Subject: Fix bad eeprom checksum misdetection on some notebooks
+Reference: 190417 235315
+Mainline: never
+
+This workaround fix a problem on some Lenovo notebooks where the first
+call to e1000_validate_eeprom_checksum fails, because the PCIe was in a deep
+powersave state. Better would be that Lenovo fix this via a BIOS update, but
+maybe that will never happen...
+
+--- linux/drivers/net/e1000/e1000_main.c.org 2007-02-02 22:01:18.000000000 +0100
++++ linux/drivers/net/e1000/e1000_main.c 2007-02-02 22:11:58.000000000 +0100
+@@ -950,8 +950,12 @@ e1000_probe(struct pci_dev *pdev,
+ /* make sure the EEPROM is good */
+
+ if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
+- DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
+- goto err_eeprom;
++ /* On some hardware the first attemp fails */
++ if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) {
++ DPRINTK(PROBE, ERR, "The EEPROM Checksum Is Not Valid\n");
++ goto err_eeprom;
++ } else
++ DPRINTK(PROBE, INFO, "The EEPROM Checksum failed in the first read, now OK\n");
+ }
+
+ /* copy the MAC address out of the EEPROM */
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi-power-resources-resume-fix-2.patch new/patches.fixes/acpi-power-resources-resume-fix-2.patch
--- old/patches.fixes/acpi-power-resources-resume-fix-2.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/acpi-power-resources-resume-fix-2.patch 2007-02-15 14:42:39.000000000 +0100
@@ -0,0 +1,315 @@
+From: Konstantin Karasyov
+Subject: fix fans on HP laptops
+Patch-mainline: not yet
+References: http://bugzilla.kernel.org/show_bug.cgi?id=7122#c52
+
+Signed-off-by: Thomas Renninger
+
+This patch belongs to acpi_fan-problem-fix.patch and
+acpi_force-fan-active.patch.
+With those patches applied and psmouse/serio fixups on shutdown and suspend
+ACPI should run reliable.
+
+---
+ drivers/acpi/power.c | 145 +++++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 124 insertions(+), 21 deletions(-)
+
+Index: linux-2.6.20-rc1/drivers/acpi/power.c
+===================================================================
+--- linux-2.6.20-rc1.orig/drivers/acpi/power.c
++++ linux-2.6.20-rc1/drivers/acpi/power.c
+@@ -57,6 +57,7 @@ ACPI_MODULE_NAME("acpi_power")
+ #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
+ static int acpi_power_add(struct acpi_device *device);
+ static int acpi_power_remove(struct acpi_device *device, int type);
++static int acpi_power_resume(struct acpi_device *device, int state);
+ static int acpi_power_open_fs(struct inode *inode, struct file *file);
+
+ static struct acpi_driver acpi_power_driver = {
+@@ -66,16 +67,23 @@ static struct acpi_driver acpi_power_dri
+ .ops = {
+ .add = acpi_power_add,
+ .remove = acpi_power_remove,
++ .resume = acpi_power_resume,
+ },
+ };
+
++struct acpi_power_reference {
++ struct list_head node;
++ struct acpi_device *device;
++};
++
+ struct acpi_power_resource {
+ struct acpi_device * device;
+ acpi_bus_id name;
+ u32 system_level;
+ u32 order;
+ int state;
+- int references;
++ struct mutex resource_lock;
++ struct list_head reference;
+ };
+
+ static struct list_head acpi_power_resource_list;
+@@ -171,22 +179,46 @@ static int acpi_power_get_list_state(str
+ return result;
+ }
+
+-static int acpi_power_on(acpi_handle handle)
++static int acpi_power_on(acpi_handle handle, struct acpi_device *dev)
+ {
+ int result = 0;
++ int found = 0;
+ acpi_status status = AE_OK;
+- struct acpi_device *device = NULL;
+ struct acpi_power_resource *resource = NULL;
++ struct list_head *node, *next;
++ struct acpi_power_reference *ref;
+
+
+ result = acpi_power_get_context(handle, &resource);
+ if (result)
+ return result;
+
+- resource->references++;
++ mutex_lock(&resource->resource_lock);
++ list_for_each_safe(node, next, &resource->reference) {
++ ref = container_of(node, struct acpi_power_reference, node);
++ if (dev->handle == ref->device->handle) {
++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] already referenced by resource [%s]\n",
++ dev->pnp.bus_id, resource->name));
++ found = 1;
++ break;
++ }
++ }
+
+- if ((resource->references > 1)
+- || (resource->state == ACPI_POWER_RESOURCE_STATE_ON)) {
++ if (!found) {
++ ref = kmalloc(sizeof (struct acpi_power_reference), GFP_ATOMIC);
++ if (!ref) {
++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "kmalloc() failed\n"));
++ mutex_unlock(&resource->resource_lock);
++ return -ENOMEM;
++ }
++ list_add_tail(&ref->node, &resource->reference);
++ ref->device = dev;
++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] added to resource [%s] references\n",
++ dev->pnp.bus_id, resource->name));
++ }
++ mutex_unlock(&resource->resource_lock);
++
++ if (resource->state == ACPI_POWER_RESOURCE_STATE_ON) {
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already on\n",
+ resource->name));
+ return 0;
+@@ -203,38 +235,48 @@ static int acpi_power_on(acpi_handle han
+ return -ENOEXEC;
+
+ /* Update the power resource's _device_ power state */
+- device = resource->device;
+ resource->device->power.state = ACPI_STATE_D0;
+
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned on\n",
+ resource->name));
+-
+ return 0;
+ }
+
+-static int acpi_power_off_device(acpi_handle handle)
++static int acpi_power_off_device(acpi_handle handle, struct acpi_device *dev)
+ {
+ int result = 0;
+ acpi_status status = AE_OK;
+ struct acpi_power_resource *resource = NULL;
++ struct list_head *node, *next;
++ struct acpi_power_reference *ref;
+
+ result = acpi_power_get_context(handle, &resource);
+ if (result)
+ return result;
+
+- if (resource->references)
+- resource->references--;
++ mutex_lock(&resource->resource_lock);
++ list_for_each_safe(node, next, &resource->reference) {
++ ref = container_of(node, struct acpi_power_reference, node);
++ if (dev->handle == ref->device->handle) {
++ list_del(&ref->node);
++ kfree(ref);
++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] removed from resource [%s] references\n",
++ dev->pnp.bus_id, resource->name));
++ break;
++ }
++ }
+
+- if (resource->references) {
+- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+- "Resource [%s] is still in use, dereferencing\n",
+- resource->device->pnp.bus_id));
++ if (!list_empty(&resource->reference)) {
++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Cannot turn resource [%s] off - resource is in use\n",
++ resource->name));
++ mutex_unlock(&resource->resource_lock);
+ return 0;
+ }
++ mutex_unlock(&resource->resource_lock);
+
+ if (resource->state == ACPI_POWER_RESOURCE_STATE_OFF) {
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already off\n",
+- resource->device->pnp.bus_id));
++ resource->name));
+ return 0;
+ }
+
+@@ -276,7 +318,7 @@ int acpi_enable_wakeup_device_power(stru
+ arg.integer.value = 1;
+ /* Open power resource */
+ for (i = 0; i < dev->wakeup.resources.count; i++) {
+- ret = acpi_power_on(dev->wakeup.resources.handles[i]);
++ ret = acpi_power_on(dev->wakeup.resources.handles[i], dev);
+ if (ret) {
+ printk(KERN_ERR PREFIX "Transition power state\n");
+ dev->wakeup.flags.valid = 0;
+@@ -323,7 +365,7 @@ int acpi_disable_wakeup_device_power(str
+
+ /* Close power resource */
+ for (i = 0; i < dev->wakeup.resources.count; i++) {
+- ret = acpi_power_off_device(dev->wakeup.resources.handles[i]);
++ ret = acpi_power_off_device(dev->wakeup.resources.handles[i], dev);
+ if (ret) {
+ printk(KERN_ERR PREFIX "Transition power state\n");
+ dev->wakeup.flags.valid = 0;
+@@ -407,7 +449,7 @@ int acpi_power_transition(struct acpi_de
+ * (e.g. so the device doesn't lose power while transitioning).
+ */
+ for (i = 0; i < tl->count; i++) {
+- result = acpi_power_on(tl->handles[i]);
++ result = acpi_power_on(tl->handles[i], device);
+ if (result)
+ goto end;
+ }
+@@ -416,7 +458,7 @@ int acpi_power_transition(struct acpi_de
+ * Then we dereference all power resources used in the current list.
+ */
+ for (i = 0; i < cl->count; i++) {
+- result = acpi_power_off_device(cl->handles[i]);
++ result = acpi_power_off_device(cl->handles[i], device);
+ if (result)
+ goto end;
+ }
+@@ -439,7 +481,11 @@ static struct proc_dir_entry *acpi_power
+
+ static int acpi_power_seq_show(struct seq_file *seq, void *offset)
+ {
++ int count = 0;
++ int result = 0;
+ struct acpi_power_resource *resource = NULL;
++ struct list_head *node, *next;
++ struct acpi_power_reference *ref;
+
+
+ resource = seq->private;
+@@ -447,6 +493,10 @@ static int acpi_power_seq_show(struct se
+ if (!resource)
+ goto end;
+
++ result = acpi_power_get_state(resource);
++ if (result)
++ goto end;
++
+ seq_puts(seq, "state: ");
+ switch (resource->state) {
+ case ACPI_POWER_RESOURCE_STATE_ON:
+@@ -460,11 +510,18 @@ static int acpi_power_seq_show(struct se
+ break;
+ }
+
++ mutex_lock(&resource->resource_lock);
++ list_for_each_safe(node, next, &resource->reference) {
++ ref = container_of(node, struct acpi_power_reference, node);
++ count++;
++ }
++ mutex_unlock(&resource->resource_lock);
++
+ seq_printf(seq, "system level: S%d\n"
+ "order: %d\n"
+ "reference count: %d\n",
+ resource->system_level,
+- resource->order, resource->references);
++ resource->order, count);
+
+ end:
+ return 0;
+@@ -537,6 +594,8 @@ static int acpi_power_add(struct acpi_de
+ return -ENOMEM;
+
+ resource->device = device;
++ mutex_init(&resource->resource_lock);
++ INIT_LIST_HEAD(&resource->reference);
+ strcpy(resource->name, device->pnp.bus_id);
+ strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
+ strcpy(acpi_device_class(device), ACPI_POWER_CLASS);
+@@ -584,6 +643,7 @@ static int acpi_power_add(struct acpi_de
+ static int acpi_power_remove(struct acpi_device *device, int type)
+ {
+ struct acpi_power_resource *resource = NULL;
++ struct list_head *node, *next;
+
+
+ if (!device || !acpi_driver_data(device))
+@@ -593,11 +653,54 @@ static int acpi_power_remove(struct acpi
+
+ acpi_power_remove_fs(device);
+
++ mutex_lock(&resource->resource_lock);
++ list_for_each_safe(node, next, &resource->reference) {
++ struct acpi_power_reference *ref = container_of(node, struct acpi_power_reference, node);
++ list_del(&ref->node);
++ kfree(ref);
++ }
++ mutex_unlock(&resource->resource_lock);
++
+ kfree(resource);
+
+ return 0;
+ }
+
++static int acpi_power_resume(struct acpi_device *device, int state)
++{
++ int result = 0;
++ struct acpi_power_resource *resource = NULL;
++ struct acpi_power_reference *ref;
++
++ if (!device || !acpi_driver_data(device))
++ return -EINVAL;
++
++ resource = (struct acpi_power_resource *)acpi_driver_data(device);
++
++ result = acpi_power_get_state(resource);
++ if (result)
++ return result;
++
++ mutex_lock(&resource->resource_lock);
++ if ((resource->state == ACPI_POWER_RESOURCE_STATE_ON) &&
++ list_empty(&resource->reference)) {
++ mutex_unlock(&resource->resource_lock);
++ result = acpi_power_off_device(device->handle, NULL);
++ return result;
++ }
++
++ if ((resource->state == ACPI_POWER_RESOURCE_STATE_OFF) &&
++ !list_empty(&resource->reference)) {
++ ref = container_of(resource->reference.next, struct acpi_power_reference, node);
++ mutex_unlock(&resource->resource_lock);
++ result = acpi_power_on(device->handle, ref->device);
++ return result;
++ }
++
++ mutex_unlock(&resource->resource_lock);
++ return 0;
++}
++
+ static int __init acpi_power_init(void)
+ {
+ int result = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_execute_notify_threaded.patch new/patches.fixes/acpi_execute_notify_threaded.patch
--- old/patches.fixes/acpi_execute_notify_threaded.patch 2007-01-09 01:56:04.000000000 +0100
+++ new/patches.fixes/acpi_execute_notify_threaded.patch 2007-02-14 02:37:46.000000000 +0100
@@ -1,9 +1,10 @@
-From: Thomas Renninger
-Subject: Acpi: create a dedicated workqueue for notify() execution
-Patch-mainline: 2.6.20-rc2-mm1
+From: Alexey Starikovskiy
+Subject: Acpi: created a dedicated workqueue for notify() execution
+Patch-mainline: not yet
References: http://bugzilla.kernel.org/show_bug.cgi?id=5534
-Novell-ref: #226069
+Signed-off-by: Thomas Renninger
+
HP nx6125/nx6325/... machines have a _GPE handler with an infinite
loop sending Notify() events to different ACPI subsystems.
@@ -53,17 +54,14 @@
to see if it's empty or atomic inc/dec).
Now you see last variant which adds yield() to every GPE execution.
http://bugzilla.kernel.org/show_bug.cgi?id=5534
+ drivers/acpi/osl.c | 43 ++++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 36 insertions(+), 7 deletions(-)
-Signed-off-by: Thomas Renninger
-
----
-
- drivers/acpi/osl.c | 53 ++++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 36 insertions(+), 17 deletions(-)
-
---- linux-2.6.19.orig/drivers/acpi/osl.c
-+++ linux-2.6.19/drivers/acpi/osl.c
-@@ -77,6 +77,7 @@ static unsigned int acpi_irq_irq;
+Index: linux-2.6.20/drivers/acpi/osl.c
+===================================================================
+--- linux-2.6.20.orig/drivers/acpi/osl.c
++++ linux-2.6.20/drivers/acpi/osl.c
+@@ -78,6 +78,7 @@ static unsigned int acpi_irq_irq;
static acpi_osd_handler acpi_irq_handler;
static void *acpi_irq_context;
static struct workqueue_struct *kacpid_wq;
@@ -71,7 +69,7 @@
acpi_status acpi_os_initialize(void)
{
-@@ -95,8 +96,9 @@ acpi_status acpi_os_initialize1(void)
+@@ -96,8 +97,9 @@ acpi_status acpi_os_initialize1(void)
return AE_NULL_ENTRY;
}
kacpid_wq = create_singlethread_workqueue("kacpid");
@@ -82,7 +80,7 @@
return AE_OK;
}
-@@ -108,6 +110,7 @@ acpi_status acpi_os_terminate(void)
+@@ -109,6 +111,7 @@ acpi_status acpi_os_terminate(void)
}
destroy_workqueue(kacpid_wq);
@@ -90,12 +88,19 @@
return AE_OK;
}
-@@ -685,10 +688,24 @@ void acpi_os_derive_pci_id(acpi_handle r
+@@ -697,9 +700,27 @@ static void acpi_os_execute_deferred(str
- static void acpi_os_execute_deferred(void *context)
- {
-- struct acpi_os_dpc *dpc = NULL;
-+ struct acpi_os_dpc *dpc = context;
+ kfree(dpc);
+
++ /* Yield cpu to notify thread */
++ cond_resched();
++
++ return;
++}
++
++static void acpi_os_execute_notify(struct work_struct *work)
++{
++ struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
+ if (!dpc) {
+ printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
+ return;
@@ -104,71 +109,38 @@
+ dpc->function(dpc->context);
+ kfree(dpc);
+
-+ /* Yield cpu to notify thread */
-+ cond_resched();
-
-+ return;
-+}
-
-- dpc = (struct acpi_os_dpc *)context;
-+static void acpi_os_execute_notify(void *context)
-+{
-+ struct acpi_os_dpc *dpc = context;
- if (!dpc) {
- printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
- return;
-@@ -723,14 +740,12 @@ acpi_status acpi_os_execute(acpi_execute
- struct acpi_os_dpc *dpc;
- struct work_struct *task;
-
-- ACPI_FUNCTION_TRACE("os_queue_for_execution");
--
- ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- "Scheduling function [%p(%p)] for deferred execution.\n",
- function, context));
-
- if (!function)
-- return_ACPI_STATUS(AE_BAD_PARAMETER);
-+ return AE_BAD_PARAMETER;
-
- /*
- * Allocate/initialize DPC structure. Note that this memory will be
-@@ -743,23 +758,27 @@ acpi_status acpi_os_execute(acpi_execute
- * from the same memory.
- */
-
-- dpc =
-- kmalloc(sizeof(struct acpi_os_dpc) + sizeof(struct work_struct),
-- GFP_ATOMIC);
-+ dpc = kzalloc(sizeof(struct acpi_os_dpc) +
-+ sizeof(struct work_struct), GFP_ATOMIC);
- if (!dpc)
- return_ACPI_STATUS(AE_NO_MEMORY);
+ return;
+ }
++
+ /*******************************************************************************
+ *
+ * FUNCTION: acpi_os_execute
+@@ -746,13 +767,21 @@ acpi_status acpi_os_execute(acpi_execute
dpc->function = function;
dpc->context = context;
-- task = (void *)(dpc + 1);
-- INIT_WORK(task, acpi_os_execute_deferred, (void *)dpc);
--
-- if (!queue_work(kacpid_wq, task)) {
+- INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+- if (!queue_work(kacpid_wq, &dpc->work)) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
- "Call to queue_work() failed.\n"));
- kfree(dpc);
- status = AE_ERROR;
-+ task = (struct work_struct *)(dpc + 1);
+ if (type == OSL_NOTIFY_HANDLER) {
-+ INIT_WORK(task, acpi_os_execute_notify, (void *)dpc);
-+ if (!queue_work(kacpi_notify_wq, task)) {
-+ status = AE_ERROR;
++ INIT_WORK(&dpc->work, acpi_os_execute_notify);
++ if (!queue_work(kacpi_notify_wq, &dpc->work)) {
+ kfree(dpc);
-+ }
-+ } else {
-+ INIT_WORK(task, acpi_os_execute_deferred, (void *)dpc);
-+ if (!queue_work(kacpid_wq, task)) {
+ status = AE_ERROR;
-+ kfree(dpc);
+ }
}
++ else {
++ INIT_WORK(&dpc->work, acpi_os_execute_deferred);
++ if (!queue_work(kacpid_wq, &dpc->work)) {
++ kfree(dpc);
++ status = AE_ERROR;
++ }
++ }
++
return_ACPI_STATUS(status);
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_fan-problem-fix.patch new/patches.fixes/acpi_fan-problem-fix.patch
--- old/patches.fixes/acpi_fan-problem-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/acpi_fan-problem-fix.patch 2007-02-15 14:42:39.000000000 +0100
@@ -0,0 +1,97 @@
+From: Konstantin Karasyov
+Subject: fix fans on HP laptops
+Patch-mainline: not yet
+References: http://bugzilla.kernel.org/show_bug.cgi?id=7570#c8
+
+Signed-off-by: Thomas Renninger
+
+
+
+diff -upN linux-2.6.20-rc3.5534.7122/drivers/acpi/bus.c linux-2.6.20-rc3.5534.7122.7570/drivers/acpi/bus.c
+--- linux-2.6.20-rc3.5534.7122/drivers/acpi/bus.c 2007-01-01 00:53:20.000000000 +0000
++++ linux-2.6.20-rc3.5534.7122.7570/drivers/acpi/bus.c 2007-01-07 20:13:02.000000000 +0000
+@@ -202,15 +202,14 @@ int acpi_bus_set_power(acpi_handle handl
+ * Get device's current power state if it's unknown
+ * This means device power state isn't initialized or previous setting failed
+ */
+- if (!device->flags.force_power_state) {
+- if (device->power.state == ACPI_STATE_UNKNOWN)
+- acpi_bus_get_power(device->handle, &device->power.state);
+- if (state == device->power.state) {
+- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
+- state));
+- return 0;
+- }
++ if ((device->power.state == ACPI_STATE_UNKNOWN) || device->flags.force_power_state)
++ acpi_bus_get_power(device->handle, &device->power.state);
++ if ((state == device->power.state) && !device->flags.force_power_state) {
++ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
++ state));
++ return 0;
+ }
++
+ if (!device->power.states[state].flags.valid) {
+ printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);
+ return -ENODEV;
+diff -upN linux-2.6.20-rc3.5534.7122/drivers/acpi/power.c linux-2.6.20-rc3.5534.7122.7570/drivers/acpi/power.c
+--- linux-2.6.20-rc3.5534.7122/drivers/acpi/power.c 2007-01-07 20:08:16.000000000 +0000
++++ linux-2.6.20-rc3.5534.7122.7570/drivers/acpi/power.c 2007-01-07 20:13:02.000000000 +0000
+@@ -456,6 +456,10 @@ int acpi_power_transition(struct acpi_de
+ goto end;
+ }
+
++ if (device->power.state == state) {
++ goto end;
++ }
++
+ /*
+ * Then we dereference all power resources used in the current list.
+ */
+diff -upN linux-2.6.20-rc3.5534.7122/drivers/acpi/thermal.c linux-2.6.20-rc3.5534.7122.7570/drivers/acpi/thermal.c
+--- linux-2.6.20-rc3.5534.7122/drivers/acpi/thermal.c 2007-01-01 00:53:20.000000000 +0000
++++ linux-2.6.20-rc3.5534.7122.7570/drivers/acpi/thermal.c 2007-01-07 20:27:02.000000000 +0000
+@@ -1356,28 +1356,32 @@ static int acpi_thermal_remove(struct ac
+ static int acpi_thermal_resume(struct acpi_device *device, int state)
+ {
+ struct acpi_thermal *tz = NULL;
+- int i;
++ int i, j, power_state, result;
++
+
+ if (!device || !acpi_driver_data(device))
+ return -EINVAL;
+
+ tz = acpi_driver_data(device);
+
+- acpi_thermal_get_temperature(tz);
+-
+ for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {
+- if (tz->trips.active[i].flags.valid) {
+- tz->temperature = tz->trips.active[i].temperature;
+- tz->trips.active[i].flags.enabled = 0;
+-
+- acpi_thermal_active(tz);
+-
+- tz->state.active |= tz->trips.active[i].flags.enabled;
+- tz->state.active_index = i;
++ if (!(&tz->trips.active[i]))
++ break;
++ if (!tz->trips.active[i].flags.valid)
++ break;
++ tz->trips.active[i].flags.enabled = 1;
++ for (j = 0; j < tz->trips.active[i].devices.count; j++) {
++ result = acpi_bus_get_power(tz->trips.active[i].devices.
++ handles[j], &power_state);
++ if (result || (power_state != ACPI_STATE_D0)) {
++ tz->trips.active[i].flags.enabled = 0;
++ break;
++ }
+ }
++ tz->state.active |= tz->trips.active[i].flags.enabled;
+ }
+
+- acpi_thermal_check(tz);
++ acpi_thermal_check(tz);
+
+ return AE_OK;
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_force-fan-active.patch new/patches.fixes/acpi_force-fan-active.patch
--- old/patches.fixes/acpi_force-fan-active.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/acpi_force-fan-active.patch 2007-02-15 14:42:39.000000000 +0100
@@ -0,0 +1,30 @@
+From: Thomas Renninger
+Subject: Always activate fan if it should be active, don't trust former values
+Patch-mainline: no
+References: 239101
+
+Signed-off-by: Thomas Renninger
+
+---
+ drivers/acpi/thermal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: linux-2.6.20/drivers/acpi/thermal.c
+===================================================================
+--- linux-2.6.20.orig/drivers/acpi/thermal.c
++++ linux-2.6.20/drivers/acpi/thermal.c
+@@ -605,8 +605,14 @@ static void acpi_thermal_active(struct a
+ if (active->temperature > maxtemp)
+ tz->state.active_index = i;
+ maxtemp = active->temperature;
++/*
++ Allways try to enable fan, to workaround unsynchronized fans on resume
++ and possibly breaking away fans on high ACPI processing (probably due
++ locking/thread problems)
++
+ if (active->flags.enabled)
+ continue;
++*/
+ for (j = 0; j < active->devices.count; j++) {
+ result =
+ acpi_bus_set_power(active->devices.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch new/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch
--- old/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/cpufreq_speedstep_acpi_nodefault.patch 2007-02-16 00:32:25.000000000 +0100
@@ -0,0 +1,28 @@
+ arch/i386/kernel/cpu/cpufreq/Kconfig | 1 -
+ arch/x86_64/kernel/cpufreq/Kconfig | 1 -
+ 2 files changed, 2 deletions(-)
+
+Index: linux-2.6.20/arch/x86_64/kernel/cpufreq/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/x86_64/kernel/cpufreq/Kconfig
++++ linux-2.6.20/arch/x86_64/kernel/cpufreq/Kconfig
+@@ -45,7 +45,6 @@ config X86_SPEEDSTEP_CENTRINO
+ config X86_SPEEDSTEP_CENTRINO_ACPI
+ bool
+ depends on X86_SPEEDSTEP_CENTRINO
+- default y
+
+ config X86_ACPI_CPUFREQ
+ tristate "ACPI Processor P-States driver"
+Index: linux-2.6.20/arch/i386/kernel/cpu/cpufreq/Kconfig
+===================================================================
+--- linux-2.6.20.orig/arch/i386/kernel/cpu/cpufreq/Kconfig
++++ linux-2.6.20/arch/i386/kernel/cpu/cpufreq/Kconfig
+@@ -125,7 +125,6 @@ config X86_SPEEDSTEP_CENTRINO_ACPI
+ bool "Use ACPI tables to decode valid frequency/voltage (deprecated)"
+ depends on X86_SPEEDSTEP_CENTRINO && ACPI_PROCESSOR
+ depends on !(X86_SPEEDSTEP_CENTRINO = y && ACPI_PROCESSOR = m)
+- default y
+ help
+ This is deprecated and this functionality is now merged into
+ acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/libata-ata_piix-acer-aspire-fix new/patches.fixes/libata-ata_piix-acer-aspire-fix
--- old/patches.fixes/libata-ata_piix-acer-aspire-fix 2007-01-11 15:22:45.000000000 +0100
+++ new/patches.fixes/libata-ata_piix-acer-aspire-fix 2007-02-17 00:54:28.000000000 +0100
@@ -1,6 +1,7 @@
From: jakub007@go2.pl
Subject: HDD on Acer Aspire 3682 WLMi limited to UDMA33
References: 227477
+Patch-mainline: yes
In Acer Aspire hdd is connected to ICH7 via 40c cable, however it is
short cable and it is UDMA66 capable.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/libata-pata_sis-udma66-fix new/patches.fixes/libata-pata_sis-udma66-fix
--- old/patches.fixes/libata-pata_sis-udma66-fix 2007-01-11 15:22:45.000000000 +0100
+++ new/patches.fixes/libata-pata_sis-udma66-fix 2007-02-17 00:54:29.000000000 +0100
@@ -1,6 +1,7 @@
From: jakub007@go2.pl
Subject: HDD on ASUS A6K limited to UDMA33
References: 227480
+Patch-mainline: yes
In ASUS A6K/A6U hdd is connected to SiS 96x via 40c cable, however it
is short cable and is UDMA66 capable.
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 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/psmouse-fiddle-with-reset.patch 2007-02-12 16:23:47.000000000 +0100
@@ -0,0 +1,77 @@
+Subject: psmouse - properly reset mouse on shutdown/suspend
+From: Dmitry Torokhov
+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
+
+Some people report that they need psmouse module unloaded
+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
+
+---
+
+ drivers/input/mouse/psmouse-base.c | 17 +++++++++++++++++
+ drivers/input/mouse/psmouse.h | 1 +
+ drivers/input/mouse/synaptics.c | 1 +
+ 3 files changed, 19 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
+ static void psmouse_cleanup(struct serio *serio)
+ {
+ struct psmouse *psmouse = serio_get_drvdata(serio);
++ struct psmouse *parent = NULL;
++
++ mutex_lock(&psmouse_mutex);
++
++ if (serio->parent && serio->id.type == SERIO_PS_PSTHRU) {
++ parent = serio_get_drvdata(serio->parent);
++ psmouse_deactivate(parent);
++ }
+
++ psmouse_deactivate(psmouse);
++ if (psmouse->cleanup)
++ psmouse->cleanup(psmouse);
+ psmouse_reset(psmouse);
++ ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
++
++ if (parent)
++ psmouse_activate(parent);
++
++ mutex_unlock(&psmouse_mutex);
+ }
+
+ /*
+Index: work/drivers/input/mouse/psmouse.h
+===================================================================
+--- work.orig/drivers/input/mouse/psmouse.h
++++ work/drivers/input/mouse/psmouse.h
+@@ -68,6 +68,7 @@ struct psmouse {
+
+ int (*reconnect)(struct psmouse *psmouse);
+ void (*disconnect)(struct psmouse *psmouse);
++ void (*cleanup)(struct psmouse *psmouse);
+ int (*poll)(struct psmouse *psmouse);
+
+ void (*pt_activate)(struct psmouse *psmouse);
+Index: work/drivers/input/mouse/synaptics.c
+===================================================================
+--- work.orig/drivers/input/mouse/synaptics.c
++++ work/drivers/input/mouse/synaptics.c
+@@ -652,6 +652,7 @@ int synaptics_init(struct psmouse *psmou
+ psmouse->set_rate = synaptics_set_rate;
+ psmouse->disconnect = synaptics_disconnect;
+ psmouse->reconnect = synaptics_reconnect;
++ psmouse->cleanup = synaptics_reset;
+ psmouse->pktsize = 6;
+ /* Synaptics can usually stay in sync without extra help */
+ psmouse->resync_time = 0;
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 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/serio-cleanup-to-bus_2.patch 2007-02-15 14:42:39.000000000 +0100
@@ -0,0 +1,173 @@
+Subject: i8042 - let serio bus suspend ports
+
+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.
+
+Signed-off-by: Dmitry Torokhov
+---
+
+ drivers/input/serio/i8042.c | 39 +++++++++++++++------------------------
+ drivers/input/serio/serio.c | 28 +++++++++++++++++++++++++++-
+ include/linux/serio.h | 6 ------
+ 3 files changed, 42 insertions(+), 31 deletions(-)
+
+Index: linux/drivers/input/serio/i8042.c
+===================================================================
+--- linux.orig/drivers/input/serio/i8042.c
++++ linux/drivers/input/serio/i8042.c
+@@ -791,27 +791,6 @@ static void i8042_controller_reset(void)
+
+
+ /*
+- * Here we try to reset everything back to a state in which the BIOS will be
+- * able to talk to the hardware when rebooting.
+- */
+-
+-static void i8042_controller_cleanup(void)
+-{
+- int i;
+-
+-/*
+- * Reset anything that is connected to the ports.
+- */
+-
+- for (i = 0; i < I8042_NUM_PORTS; i++)
+- if (i8042_ports[i].serio)
+- serio_cleanup(i8042_ports[i].serio);
+-
+- i8042_controller_reset();
+-}
+-
+-
+-/*
+ * 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
+ #undef DELAY
+
+ /*
+- * 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.
+ */
+
+ static int i8042_suspend(struct platform_device *dev, pm_message_t state)
+ {
+- i8042_controller_cleanup();
++ if (state.event == PM_EVENT_SUSPEND)
++ i8042_controller_reset();
+
+ return 0;
+ }
+@@ -877,6 +859,12 @@ static int i8042_resume(struct platform_
+ {
+ int error;
+
++/*
++ * Do not bother with restoring state if we haven't really suspened yet
++ */
++ if (dev->dev.power.power_state.event != PM_EVENT_SUSPEND)
++ 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
+ */
+
++ i8042_ctr = i8042_initial_ctr;
++ if (i8042_direct)
++ i8042_ctr &= ~I8042_CTR_XLATE;
+ 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_
+
+ static void i8042_shutdown(struct platform_device *dev)
+ {
+- i8042_controller_cleanup();
++ i8042_controller_reset();
+ }
+
+ static int __devinit i8042_create_kbd_port(void)
+Index: linux/drivers/input/serio/serio.c
+===================================================================
+--- linux.orig/drivers/input/serio/serio.c
++++ linux/drivers/input/serio/serio.c
+@@ -778,6 +778,19 @@ static int serio_driver_remove(struct de
+ return 0;
+ }
+
++static void serio_cleanup(struct serio *serio)
++{
++ if (serio->drv && serio->drv->cleanup)
++ serio->drv->cleanup(serio);
++}
++
++static void serio_shutdown(struct device *dev)
++{
++ struct serio *serio = to_serio_port(dev);
++
++ serio_cleanup(serio);
++}
++
+ static void serio_attach_driver(struct serio_driver *drv)
+ {
+ int error;
+@@ -910,11 +923,22 @@ static int serio_uevent(struct device *d
+
+ #endif /* CONFIG_HOTPLUG */
+
++static int serio_suspend(struct device *dev, pm_message_t state)
++{
++ struct serio *serio = to_serio_port(dev);
++
++ if (state.event == PM_EVENT_SUSPEND)
++ serio_cleanup(serio);
++
++ return 0;
++}
++
+ static int serio_resume(struct device *dev)
+ {
+ struct serio *serio = to_serio_port(dev);
+
+- if (serio_reconnect_driver(serio)) {
++ if (dev->power.power_state.event == PM_EVENT_SUSPEND &&
++ 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 = {
+ .uevent = serio_uevent,
+ .probe = serio_driver_probe,
+ .remove = serio_driver_remove,
++ .shutdown = serio_shutdown,
++ .suspend = serio_suspend,
+ .resume = serio_resume,
+ };
+
+Index: linux/include/linux/serio.h
+===================================================================
+--- linux.orig/include/linux/serio.h
++++ linux/include/linux/serio.h
+@@ -108,12 +108,6 @@ static inline void serio_drv_write_wakeu
+ serio->drv->write_wakeup(serio);
+ }
+
+-static inline void serio_cleanup(struct serio *serio)
+-{
+- if (serio->drv && serio->drv->cleanup)
+- serio->drv->cleanup(serio);
+-}
+-
+ /*
+ * Use the following functions to manipulate serio's per-port
+ * driver-specific data.
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch new/patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch
--- old/patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch 2007-01-13 11:00:22.000000000 +0100
+++ new/patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch 2007-02-17 00:54:29.000000000 +0100
@@ -17,12 +17,16 @@
drivers/acpi/osl.c | 127 ++++++++++++++++++++++++++++++++++++++++++--
drivers/acpi/tables/tbget.c | 8 ++
include/acpi/acpiosxf.h | 4 +
- 4 files changed, 152 insertions(+), 4 deletions(-)
+ init/initramfs.c | 22 +++++++
+ init/main.c | 7 ++
+ 6 files changed, 181 insertions(+), 4 deletions(-)
Signed-off-by: Thomas Renninger
---- linux-2.6.19.orig/drivers/acpi/Kconfig
-+++ linux-2.6.19/drivers/acpi/Kconfig
+Index: linux-2.6.20/drivers/acpi/Kconfig
+===================================================================
+--- linux-2.6.20.orig/drivers/acpi/Kconfig
++++ linux-2.6.20/drivers/acpi/Kconfig
@@ -268,6 +268,23 @@ config ACPI_CUSTOM_DSDT_FILE
Enter the full path name to the file which includes the AmlCode
declaration.
@@ -47,8 +51,10 @@
config ACPI_BLACKLIST_YEAR
int "Disable ACPI for systems before Jan 1st this year" if X86_32
default 0
---- linux-2.6.19.orig/drivers/acpi/osl.c
-+++ linux-2.6.19/drivers/acpi/osl.c
+Index: linux-2.6.20/drivers/acpi/osl.c
+===================================================================
+--- linux-2.6.20.orig/drivers/acpi/osl.c
++++ linux-2.6.20/drivers/acpi/osl.c
@@ -70,6 +70,10 @@ extern char line_buf[80];
int acpi_specific_hotkey_enabled = TRUE;
EXPORT_SYMBOL(acpi_specific_hotkey_enabled);
@@ -200,8 +206,10 @@
#endif
return AE_OK;
}
---- linux-2.6.19.orig/drivers/acpi/tables/tbget.c
-+++ linux-2.6.19/drivers/acpi/tables/tbget.c
+Index: linux-2.6.20/drivers/acpi/tables/tbget.c
+===================================================================
+--- linux-2.6.20.orig/drivers/acpi/tables/tbget.c
++++ linux-2.6.20/drivers/acpi/tables/tbget.c
@@ -278,6 +278,14 @@ acpi_tb_table_override(struct acpi_table
address.pointer.logical = new_table;
@@ -217,8 +225,10 @@
if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status, "Could not copy ACPI table"));
return_ACPI_STATUS(status);
---- linux-2.6.19.orig/include/acpi/acpiosxf.h
-+++ linux-2.6.19/include/acpi/acpiosxf.h
+Index: linux-2.6.20/include/acpi/acpiosxf.h
+===================================================================
+--- linux-2.6.20.orig/include/acpi/acpiosxf.h
++++ linux-2.6.20/include/acpi/acpiosxf.h
@@ -95,6 +95,10 @@ acpi_status
acpi_os_table_override(struct acpi_table_header *existing_table,
struct acpi_table_header **new_table);
@@ -230,3 +240,63 @@
/*
* Spinlock primitives
*/
+Index: linux-2.6.20/init/initramfs.c
+===================================================================
+--- linux-2.6.20.orig/init/initramfs.c
++++ linux-2.6.20/init/initramfs.c
+@@ -526,6 +526,28 @@ static void __init free_initrd(void)
+
+ #endif
+
++#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
++/* Tries to read the initramfs if it's already there, for ACPI Table Overiding */
++void __init early_populate_rootfs(void)
++{
++ char *err = unpack_to_rootfs(__initramfs_start,
++ __initramfs_end - __initramfs_start, 0);
++ if (err)
++ return;
++#ifdef CONFIG_BLK_DEV_INITRD
++ if (initrd_start) {
++ printk(KERN_INFO "Early unpacking initramfs...");
++ err = unpack_to_rootfs((char *)initrd_start,
++ initrd_end - initrd_start, 0);
++ if (err)
++ return;
++ printk(" done\n");
++ }
++#endif /* CONFIG_BLK_DEV_INITRD */
++ return;
++}
++#endif /* CONFIG_ACPI_CUSTOM_DSDT_INITRD */
++
+ static int __init populate_rootfs(void)
+ {
+ char *err = unpack_to_rootfs(__initramfs_start,
+Index: linux-2.6.20/init/main.c
+===================================================================
+--- linux-2.6.20.orig/init/main.c
++++ linux-2.6.20/init/main.c
+@@ -100,8 +100,14 @@ extern void free_initmem(void);
+ extern void prepare_namespace(void);
+ #ifdef CONFIG_ACPI
+ extern void acpi_early_init(void);
++#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
++extern void early_populate_rootfs(void);
++#else
++static inline void early_populate_rootfs(void) { }
++#endif
+ #else
+ static inline void acpi_early_init(void) { }
++static inline void early_populate_rootfs(void) { }
+ #endif
+ #ifndef CONFIG_DEBUG_RODATA
+ static inline void mark_rodata_ro(void) { }
+@@ -665,6 +671,7 @@ asmlinkage void __init start_kernel(void
+
+ check_bugs();
+
++ early_populate_rootfs(); /* For DSDT override from initramfs */
+ acpi_early_init(); /* before LAPIC and SMP init */
+
+ /* Do the rest non-__init'ed, we're now alive */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-common new/patches.suse/kdb-common
--- old/patches.suse/kdb-common 2007-02-07 08:33:52.000000000 +0100
+++ new/patches.suse/kdb-common 2007-02-14 02:37:48.000000000 +0100
@@ -1,16 +1,12 @@
From: Keith Owens
-Subject: Announce: kdb v4.4 is available for kernel 2.6.18
+Subject: kdb v4.4
Acked-by: schwab@suse.de
Patch-Mainline: never
-KDB (Linux Kernel Debugger) has been updated for kernel 2.6.18.
-
ftp://oss.sgi.com/projects/kdb/download/v4.4/
ftp://ftp.ocs.com.au/pub/mirrors/oss.sgi.com/projects/kdb/download/v4.4/
-Current versions are :-
-
- kdb-v4.4-2.6.20-rc7-common-1
+kdb-v4.4-2.6.20-common-1
---
Documentation/kdb/kdb.mm | 492 +++++
Documentation/kdb/kdb_bp.man | 197 ++
@@ -41,7 +37,7 @@
include/linux/kdbprivate.h | 493 +++++
include/linux/sysctl.h | 1
init/main.c | 32
- kdb/ChangeLog | 1561 ++++++++++++++++
+ kdb/ChangeLog | 1565 ++++++++++++++++
kdb/Makefile | 28
kdb/kdb_bp.c | 619 ++++++
kdb/kdb_bt.c | 180 +
@@ -65,10 +61,12 @@
kernel/signal.c | 49
mm/hugetlb.c | 19
mm/swapfile.c | 22
- 53 files changed, 17079 insertions(+), 8 deletions(-)
+ 53 files changed, 17083 insertions(+), 8 deletions(-)
+Index: linux/Documentation/kdb/kdb.mm
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb.mm
++++ linux/Documentation/kdb/kdb.mm
@@ -0,0 +1,492 @@
+.TH KDB 8 "September 21, 2005"
+.hy 0
@@ -562,8 +560,10 @@
+.SH SEE ALSO
+.P
+linux/Documentation/kdb/kdb_{bp,bt,env,ll,md,ps,rd,sr,ss}.man
+Index: linux/Documentation/kdb/kdb_bp.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_bp.man
++++ linux/Documentation/kdb/kdb_bp.man
@@ -0,0 +1,197 @@
+.TH BD 1 "July 12, 2004"
+.SH NAME
@@ -762,8 +762,10 @@
+.TP 8
+bc *
+Clear all breakpoints
+Index: linux/Documentation/kdb/kdb_bt.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_bt.man
++++ linux/Documentation/kdb/kdb_bt.man
@@ -0,0 +1,228 @@
+.TH BT 1 "August 25, 2006"
+.SH NAME
@@ -993,8 +995,10 @@
+ kernel .text 0xc0100000 0xc01176c4 0xc01178e8
+ 0xc01095f8 system_call+0x34
+ kernel .text 0xc0100000 0xc01095c4 0xc01095fc
+Index: linux/Documentation/kdb/kdb_env.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_env.man
++++ linux/Documentation/kdb/kdb_env.man
@@ -0,0 +1,46 @@
+.TH ENV 1 "24 September 2000"
+.SH NAME
@@ -1042,8 +1046,10 @@
+set IDCOUNT=100
+Set the number of lines to display for the \fBid\fP command
+to the value \fI100\fP.
+Index: linux/Documentation/kdb/kdb_ll.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_ll.man
++++ linux/Documentation/kdb/kdb_ll.man
@@ -0,0 +1,134 @@
+.TH LL 1 "19 April 1999"
+.SH NAME
@@ -1179,8 +1185,10 @@
+page_prot = 0x25 avl_height = 2244 vm_offset = 0x0
+flags: READ WRITE EXEC MAYREAD MAYWRITE MAYEXEC GROWSDOWN
+kdb>
+Index: linux/Documentation/kdb/kdb_md.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_md.man
++++ linux/Documentation/kdb/kdb_md.man
@@ -0,0 +1,136 @@
+.TH MD 1 "August 4, 2004"
+.SH NAME
@@ -1318,8 +1326,10 @@
+md chrdev_table 15
+Display 15 lines (at 16 bytes per line) starting at address
+represented by the symbol \fIchrdev_table\fP.
+Index: linux/Documentation/kdb/kdb_ps.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_ps.man
++++ linux/Documentation/kdb/kdb_ps.man
@@ -0,0 +1,96 @@
+.TH PS 1 "September 14, 2004"
+.SH NAME
@@ -1417,8 +1427,10 @@
+displays all tasks.
+This is easier than remembering DRSTCZEUIM.
+
+Index: linux/Documentation/kdb/kdb_rd.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_rd.man
++++ linux/Documentation/kdb/kdb_rd.man
@@ -0,0 +1,170 @@
+.TH RD 1 "September 20, 2005"
+.SH NAME
@@ -1590,8 +1602,10 @@
+.TP 8
+rm %CP15CRn7CRm5Op6 0
+Same with above.
+Index: linux/Documentation/kdb/kdb_sr.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_sr.man
++++ linux/Documentation/kdb/kdb_sr.man
@@ -0,0 +1,68 @@
+.TH SR 1 "7 October 2002"
+.SH NAME
@@ -1661,8 +1675,10 @@
+If the sysrq handler or any of the sysrq functions have to wait for a
+lock then they will never return and kdb will appear to hang.
+Invoking sysrq code from kdb is inherently unsafe.
+Index: linux/Documentation/kdb/kdb_ss.man
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/kdb_ss.man
++++ linux/Documentation/kdb/kdb_ss.man
@@ -0,0 +1,109 @@
+.TH SS 1 "17 January 2002"
+.SH NAME
@@ -1773,8 +1789,10 @@
+sys_read+0x6: pushl %edi
+[0]kdb>
+
+Index: linux/Documentation/kdb/slides
+===================================================================
--- /dev/null
-+++ linux-2.6.20/Documentation/kdb/slides
++++ linux/Documentation/kdb/slides
@@ -0,0 +1,1382 @@
+#! /opt/cpg/bin/do-mgp
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3158,9 +3176,11 @@
+ [Uptodate Req Mapped]
+DIRTY page_struct index cnt flags
+LOCKED page_struct index cnt flags
---- linux-2.6.20.orig/Makefile
-+++ linux-2.6.20/Makefile
-@@ -560,6 +560,7 @@ export mod_strip_cmd
+Index: linux/Makefile
+===================================================================
+--- linux.orig/Makefile
++++ linux/Makefile
+@@ -554,6 +554,7 @@ export mod_strip_cmd
ifeq ($(KBUILD_EXTMOD),)
core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
@@ -3168,8 +3188,10 @@
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
---- linux-2.6.20.orig/drivers/char/keyboard.c
-+++ linux-2.6.20/drivers/char/keyboard.c
+Index: linux/drivers/char/keyboard.c
+===================================================================
+--- linux.orig/drivers/char/keyboard.c
++++ linux/drivers/char/keyboard.c
@@ -40,6 +40,9 @@
#include
#include
@@ -3194,8 +3216,10 @@
#ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */
if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) {
if (!sysrq_down) {
---- linux-2.6.20.orig/drivers/serial/8250.c
-+++ linux-2.6.20/drivers/serial/8250.c
+Index: linux/drivers/serial/8250.c
+===================================================================
+--- linux.orig/drivers/serial/8250.c
++++ linux/drivers/serial/8250.c
@@ -45,6 +45,19 @@
#include
@@ -3214,9 +3238,9 @@
+static const char *kdb_serial_ptr = kdb_serial_str;
+#endif /* CONFIG_KDB */
- #ifndef NO_PC_LEGACY_SERIAL_8250
- #define do_not_probe_pc_legacy_8250 (0)
-@@ -1188,6 +1201,20 @@ receive_chars(struct uart_8250_port *up,
+ /*
+ * Configuration:
+@@ -1184,6 +1197,20 @@ receive_chars(struct uart_8250_port *up,
do {
ch = serial_inp(up, UART_RX);
@@ -3237,7 +3261,7 @@
flag = TTY_NORMAL;
up->port.icount.rx++;
-@@ -2271,7 +2298,7 @@ serial8250_console_write(struct console
+@@ -2267,7 +2294,7 @@ serial8250_console_write(struct console
if (up->port.sysrq) {
/* serial8250_handle_port() already took the lock */
locked = 0;
@@ -3246,7 +3270,7 @@
locked = spin_trylock(&up->port.lock);
} else
spin_lock(&up->port.lock);
-@@ -2319,6 +2346,30 @@ static int __init serial8250_console_set
+@@ -2315,6 +2342,30 @@ static int __init serial8250_console_set
if (!port->iobase && !port->membase)
return -ENODEV;
@@ -3277,8 +3301,10 @@
if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow);
---- linux-2.6.20.orig/drivers/serial/8250_early.c
-+++ linux-2.6.20/drivers/serial/8250_early.c
+Index: linux/drivers/serial/8250_early.c
+===================================================================
+--- linux.orig/drivers/serial/8250_early.c
++++ linux/drivers/serial/8250_early.c
@@ -35,6 +35,13 @@
#include
#include
@@ -3334,8 +3360,10 @@
return err;
return early_uart_console_init();
}
---- linux-2.6.20.orig/drivers/serial/sn_console.c
-+++ linux-2.6.20/drivers/serial/sn_console.c
+Index: linux/drivers/serial/sn_console.c
+===================================================================
+--- linux.orig/drivers/serial/sn_console.c
++++ linux/drivers/serial/sn_console.c
@@ -48,6 +48,22 @@
#include /* for mdelay */
#include
@@ -3434,8 +3462,10 @@
+ return 0;
+}
+#endif /* CONFIG_KDB */
---- linux-2.6.20.orig/drivers/usb/host/ohci-hcd.c
-+++ linux-2.6.20/drivers/usb/host/ohci-hcd.c
+Index: linux/drivers/usb/host/ohci-hcd.c
+===================================================================
+--- linux.orig/drivers/usb/host/ohci-hcd.c
++++ linux/drivers/usb/host/ohci-hcd.c
@@ -847,6 +847,53 @@ static int ohci_restart (struct ohci_hcd
/*-------------------------------------------------------------------------*/
@@ -3490,8 +3520,10 @@
#define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC
MODULE_AUTHOR (DRIVER_AUTHOR);
---- linux-2.6.20.orig/drivers/usb/host/ohci-pci.c
-+++ linux-2.6.20/drivers/usb/host/ohci-pci.c
+Index: linux/drivers/usb/host/ohci-pci.c
+===================================================================
+--- linux.orig/drivers/usb/host/ohci-pci.c
++++ linux/drivers/usb/host/ohci-pci.c
@@ -18,6 +18,10 @@
#error "This file is PCI bus glue. CONFIG_PCI must be defined."
#endif
@@ -3515,8 +3547,10 @@
return 0;
}
---- linux-2.6.20.orig/drivers/usb/host/ohci-q.c
-+++ linux-2.6.20/drivers/usb/host/ohci-q.c
+Index: linux/drivers/usb/host/ohci-q.c
+===================================================================
+--- linux.orig/drivers/usb/host/ohci-q.c
++++ linux/drivers/usb/host/ohci-q.c
@@ -1115,3 +1115,65 @@ dl_done_list (struct ohci_hcd *ohci)
td = td_next;
}
@@ -3583,8 +3617,10 @@
+}
+
+#endif /* CONFIG_KDB_USB */
---- linux-2.6.20.orig/drivers/usb/input/hid-core.c
-+++ linux-2.6.20/drivers/usb/input/hid-core.c
+Index: linux/drivers/usb/input/hid-core.c
+===================================================================
+--- linux.orig/drivers/usb/input/hid-core.c
++++ linux/drivers/usb/input/hid-core.c
@@ -46,6 +46,10 @@
#define DRIVER_DESC "USB HID core driver"
#define DRIVER_LICENSE "GPL"
@@ -3596,7 +3632,7 @@
static char *hid_types[] = {"Device", "Pointer", "Mouse", "Device", "Joystick",
"Gamepad", "Keyboard", "Keypad", "Multi-Axis Controller"};
/*
-@@ -1269,6 +1273,12 @@ static void hid_disconnect(struct usb_in
+@@ -1263,6 +1267,12 @@ static void hid_disconnect(struct usb_in
usbhid = hid->driver_data;
@@ -3609,7 +3645,7 @@
spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
usb_set_intfdata(intf, NULL);
spin_unlock_irq(&usbhid->inlock);
-@@ -1352,6 +1362,16 @@ static int hid_probe(struct usb_interfac
+@@ -1346,6 +1356,16 @@ static int hid_probe(struct usb_interfac
printk(": USB HID v%x.%02x %s [%s] on %s\n",
hid->version >> 8, hid->version & 0xff, c, hid->name, path);
@@ -3626,8 +3662,10 @@
return 0;
}
---- linux-2.6.20.orig/drivers/usb/input/usbkbd.c
-+++ linux-2.6.20/drivers/usb/input/usbkbd.c
+Index: linux/drivers/usb/input/usbkbd.c
+===================================================================
+--- linux.orig/drivers/usb/input/usbkbd.c
++++ linux/drivers/usb/input/usbkbd.c
@@ -31,6 +31,9 @@
#include
#include
@@ -3664,8 +3702,10 @@
if (kbd) {
usb_kill_urb(kbd->irq);
input_unregister_device(kbd->dev);
---- linux-2.6.20.orig/fs/proc/mmu.c
-+++ linux-2.6.20/fs/proc/mmu.c
+Index: linux/fs/proc/mmu.c
+===================================================================
+--- linux.orig/fs/proc/mmu.c
++++ linux/fs/proc/mmu.c
@@ -31,11 +31,21 @@
#include
#include "internal.h"
@@ -3707,8 +3747,10 @@
+ read_unlock(&vmlist_lock);
}
}
---- linux-2.6.20.orig/fs/proc/proc_misc.c
-+++ linux-2.6.20/fs/proc/proc_misc.c
+Index: linux/fs/proc/proc_misc.c
+===================================================================
+--- linux.orig/fs/proc/proc_misc.c
++++ linux/fs/proc/proc_misc.c
@@ -221,6 +221,125 @@ static int meminfo_read_proc(char *page,
#undef K
}
@@ -3835,8 +3877,10 @@
extern struct seq_operations fragmentation_op;
static int fragmentation_open(struct inode *inode, struct file *file)
{
---- linux-2.6.20.orig/include/linux/console.h
-+++ linux-2.6.20/include/linux/console.h
+Index: linux/include/linux/console.h
+===================================================================
+--- linux.orig/include/linux/console.h
++++ linux/include/linux/console.h
@@ -134,7 +134,12 @@ void prom_con_init(void);
/* Some debug stub to catch some of the obvious races in the VT code */
@@ -3850,8 +3894,10 @@
#else
#define WARN_CONSOLE_UNLOCKED()
#endif
+Index: linux/include/linux/dis-asm.h
+===================================================================
--- /dev/null
-+++ linux-2.6.20/include/linux/dis-asm.h
++++ linux/include/linux/dis-asm.h
@@ -0,0 +1,347 @@
+/* Interface between the opcode library and its callers.
+
@@ -4200,8 +4246,10 @@
+#endif
+
+#endif /* ! defined (DIS_ASM_H) */
+Index: linux/include/linux/kdb.h
+===================================================================
--- /dev/null
-+++ linux-2.6.20/include/linux/kdb.h
++++ linux/include/linux/kdb.h
@@ -0,0 +1,164 @@
+#ifndef _KDB_H
+#define _KDB_H
@@ -4367,8 +4415,10 @@
+extern const char kdb_serial_str[];
+
+#endif /* !_KDB_H */
+Index: linux/include/linux/kdbprivate.h
+===================================================================
--- /dev/null
-+++ linux-2.6.20/include/linux/kdbprivate.h
++++ linux/include/linux/kdbprivate.h
@@ -0,0 +1,493 @@
+#ifndef _KDBPRIVATE_H
+#define _KDBPRIVATE_H
@@ -4863,18 +4913,22 @@
+extern void kdba_cpu_up(void);
+
+#endif /* !_KDBPRIVATE_H */
---- linux-2.6.20.orig/include/linux/sysctl.h
-+++ linux-2.6.20/include/linux/sysctl.h
+Index: linux/include/linux/sysctl.h
+===================================================================
+--- linux.orig/include/linux/sysctl.h
++++ linux/include/linux/sysctl.h
@@ -161,6 +161,7 @@ enum
KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
KERN_UNSUPPORTED, /* int: allow loading of unsupported modules */
-+ KERN_KDB, /* int: kdb on/off */
++ KERN_KDB=78, /* int: kdb on/off */
};
---- linux-2.6.20.orig/init/main.c
-+++ linux-2.6.20/init/main.c
+Index: linux/init/main.c
+===================================================================
+--- linux.orig/init/main.c
++++ linux/init/main.c
@@ -63,6 +63,10 @@
#include
#endif
@@ -4886,7 +4940,7 @@
/*
* This is one of the first .c files built. Error out early if we have compiler
* trouble.
-@@ -186,6 +190,26 @@ static const char *panic_later, *panic_p
+@@ -182,6 +186,26 @@ static const char *panic_later, *panic_p
extern struct obs_kernel_param __setup_start[], __setup_end[];
@@ -4913,7 +4967,7 @@
static int __init obsolete_checksetup(char *line)
{
struct obs_kernel_param *p;
-@@ -609,6 +633,14 @@ asmlinkage void __init start_kernel(void
+@@ -590,6 +614,14 @@ asmlinkage void __init start_kernel(void
pgtable_cache_init();
prio_tree_init();
anon_vma_init();
@@ -4928,9 +4982,15 @@
#ifdef CONFIG_X86
if (efi_enabled)
efi_enter_virtual_mode();
+Index: linux/kdb/ChangeLog
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/ChangeLog
-@@ -0,0 +1,1561 @@
++++ linux/kdb/ChangeLog
+@@ -0,0 +1,1565 @@
++2007-02-06 Keith Owens
++
++ * kdb v4.4-2.6.20-common-1.
++
+2007-02-01 Keith Owens
+
+ * kdb v4.4-2.6.20-rc7-common-1.
@@ -6492,8 +6552,10 @@
+ * include/linux/kdbprivate.h: add kdb_initial_cpu.
+
+ * include/linux/kdb.h: add kdb_on, bump version to kdb v1.4.
+Index: linux/kdb/Makefile
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/Makefile
++++ linux/kdb/Makefile
@@ -0,0 +1,28 @@
+#
+# This file is subject to the terms and conditions of the GNU General Public
@@ -6523,8 +6585,10 @@
+
+$(obj)/gen-kdb_cmds.c: $(src)/kdb_cmds $(wildcard $(TOPDIR)/arch/$(ARCH)/kdb/kdb_cmds) $(src)/Makefile
+ $(call cmd,gen-kdb)
+Index: linux/kdb/kdb_bp.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/kdb_bp.c
++++ linux/kdb/kdb_bp.c
@@ -0,0 +1,619 @@
+/*
+ * Kernel Debugger Architecture Independent Breakpoint Handler
@@ -7145,8 +7209,10 @@
+ */
+ kdba_initbp();
+}
+Index: linux/kdb/kdb_bt.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/kdb_bt.c
++++ linux/kdb/kdb_bt.c
@@ -0,0 +1,180 @@
+/*
+ * Kernel Debugger Architecture Independent Stack Traceback
@@ -7328,8 +7394,10 @@
+ /* NOTREACHED */
+ return 0;
+}
+Index: linux/kdb/kdb_cmds
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/kdb_cmds
++++ linux/kdb/kdb_cmds
@@ -0,0 +1,32 @@
+# Initial commands for kdb, alter to suit your needs.
+# These commands are executed in kdb_init() context, no SMP, no
@@ -7363,8 +7431,10 @@
+ -archkdbcommon
+ -bta
+endefcmd
+Index: linux/kdb/kdb_id.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/kdb_id.c
++++ linux/kdb/kdb_id.c
@@ -0,0 +1,233 @@
+/*
+ * Kernel Debugger Architecture Independent Instruction Disassembly
@@ -7599,8 +7669,10 @@
+
+ kdba_id_init(&kdb_di);
+}
+Index: linux/kdb/kdb_io.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/kdb_io.c
++++ linux/kdb/kdb_io.c
@@ -0,0 +1,663 @@
+/*
+ * Kernel Debugger Architecture Independent Console I/O handler
@@ -8265,8 +8337,10 @@
+}
+
+EXPORT_SYMBOL(kdb_read);
+Index: linux/kdb/kdbmain.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/kdbmain.c
++++ linux/kdb/kdbmain.c
@@ -0,0 +1,4021 @@
+/*
+ * Kernel Debugger Architecture Independent Main Code
@@ -12289,8 +12363,10 @@
+EXPORT_SYMBOL(kdb_printf);
+EXPORT_SYMBOL(kdb_symbol_print);
+EXPORT_SYMBOL(kdb_running_process);
+Index: linux/kdb/kdbsupport.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/kdbsupport.c
++++ linux/kdb/kdbsupport.c
@@ -0,0 +1,1064 @@
+/*
+ * Kernel Debugger Architecture Independent Support Functions
@@ -13356,8 +13432,10 @@
+ BUG_ON(kdb_flags_index <= 0);
+ kdb_flags = kdb_flags_stack[--kdb_flags_index];
+}
+Index: linux/kdb/modules/Makefile
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/modules/Makefile
++++ linux/kdb/modules/Makefile
@@ -0,0 +1,14 @@
+#
+# This file is subject to the terms and conditions of the GNU General Public
@@ -13373,8 +13451,10 @@
+endif
+obj-$(CONFIG_KDB_MODULES_XP) += kdbm_xpc.o
+CFLAGS_kdbm_vm.o += -I $(srctree)/drivers/scsi
+Index: linux/kdb/modules/kdbm_pg.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/modules/kdbm_pg.c
++++ linux/kdb/modules/kdbm_pg.c
@@ -0,0 +1,647 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -14023,8 +14103,10 @@
+
+module_init(kdbm_pg_init)
+module_exit(kdbm_pg_exit)
+Index: linux/kdb/modules/kdbm_sched.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/modules/kdbm_sched.c
++++ linux/kdb/modules/kdbm_sched.c
@@ -0,0 +1,57 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -14083,8 +14165,10 @@
+
+module_init(kdbm_sched_init)
+module_exit(kdbm_sched_exit)
+Index: linux/kdb/modules/kdbm_task.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/modules/kdbm_task.c
++++ linux/kdb/modules/kdbm_task.c
@@ -0,0 +1,199 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -14285,8 +14369,10 @@
+
+kdb_module_init(kdbm_task_init)
+kdb_module_exit(kdbm_task_exit)
+Index: linux/kdb/modules/kdbm_vm.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/modules/kdbm_vm.c
++++ linux/kdb/modules/kdbm_vm.c
@@ -0,0 +1,841 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -15129,8 +15215,10 @@
+
+module_init(kdbm_vm_init)
+module_exit(kdbm_vm_exit)
+Index: linux/kdb/modules/kdbm_x86.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/modules/kdbm_x86.c
++++ linux/kdb/modules/kdbm_x86.c
@@ -0,0 +1,1037 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -16169,8 +16257,10 @@
+
+module_init(kdbm_x86_init)
+module_exit(kdbm_x86_exit)
+Index: linux/kdb/modules/kdbm_xpc.c
+===================================================================
--- /dev/null
-+++ linux-2.6.20/kdb/modules/kdbm_xpc.c
++++ linux/kdb/modules/kdbm_xpc.c
@@ -0,0 +1,1105 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -17277,8 +17367,10 @@
+module_init(kdbm_xpc_register);
+module_exit(kdbm_xpc_unregister);
+
---- linux-2.6.20.orig/kernel/exit.c
-+++ linux-2.6.20/kernel/exit.c
+Index: linux/kernel/exit.c
+===================================================================
+--- linux.orig/kernel/exit.c
++++ linux/kernel/exit.c
@@ -4,6 +4,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
@@ -17289,8 +17381,10 @@
#include
#include
#include
---- linux-2.6.20.orig/kernel/kallsyms.c
-+++ linux-2.6.20/kernel/kallsyms.c
+Index: linux/kernel/kallsyms.c
+===================================================================
+--- linux.orig/kernel/kallsyms.c
++++ linux/kernel/kallsyms.c
@@ -452,3 +452,25 @@ static int __init kallsyms_init(void)
__initcall(kallsyms_init);
@@ -17317,9 +17411,11 @@
+ }
+}
+#endif /* CONFIG_KDB */
---- linux-2.6.20.orig/kernel/module.c
-+++ linux-2.6.20/kernel/module.c
-@@ -2136,24 +2136,37 @@ const char *module_address_lookup(unsign
+Index: linux/kernel/module.c
+===================================================================
+--- linux.orig/kernel/module.c
++++ linux/kernel/module.c
+@@ -2100,24 +2100,37 @@ const char *module_address_lookup(unsign
return NULL;
}
@@ -17360,11 +17456,13 @@
return NULL;
}
---- linux-2.6.20.orig/kernel/printk.c
-+++ linux-2.6.20/kernel/printk.c
-@@ -333,6 +333,20 @@ void debugger_syslog_data(char *syslog_d
+Index: linux/kernel/printk.c
+===================================================================
+--- linux.orig/kernel/printk.c
++++ linux/kernel/printk.c
+@@ -318,6 +318,20 @@ asmlinkage long sys_syslog(int type, cha
+ return do_syslog(type, buf, len);
}
- #endif /* CONFIG_DEBUG_KERNEL */
+#ifdef CONFIG_KDB
+/* kdb dmesg command needs access to the syslog buffer. do_syslog() uses locks
@@ -17383,8 +17481,10 @@
/*
* Call the console drivers on a range of log_buf
*/
---- linux-2.6.20.orig/kernel/sched.c
-+++ linux-2.6.20/kernel/sched.c
+Index: linux/kernel/sched.c
+===================================================================
+--- linux.orig/kernel/sched.c
++++ linux/kernel/sched.c
@@ -7014,7 +7014,7 @@ void normalize_rt_tasks(void)
#endif /* CONFIG_MAGIC_SYSRQ */
@@ -17475,8 +17575,10 @@
+EXPORT_SYMBOL(kdb_runqueue);
+
+#endif /* CONFIG_KDB */
---- linux-2.6.20.orig/kernel/signal.c
-+++ linux-2.6.20/kernel/signal.c
+Index: linux/kernel/signal.c
+===================================================================
+--- linux.orig/kernel/signal.c
++++ linux/kernel/signal.c
@@ -2641,3 +2641,52 @@ void __init signals_init(void)
__alignof__(struct sigqueue),
SLAB_PANIC, NULL, NULL);
@@ -17530,8 +17632,10 @@
+ kdb_printf("Signal %d is sent to process %d.\n", sig, t->pid);
+}
+#endif /* CONFIG_KDB */
---- linux-2.6.20.orig/mm/hugetlb.c
-+++ linux-2.6.20/mm/hugetlb.c
+Index: linux/mm/hugetlb.c
+===================================================================
+--- linux.orig/mm/hugetlb.c
++++ linux/mm/hugetlb.c
@@ -245,6 +245,25 @@ int hugetlb_sysctl_handler(struct ctl_ta
}
#endif /* CONFIG_SYSCTL */
@@ -17558,8 +17662,10 @@
int hugetlb_report_meminfo(char *buf)
{
return sprintf(buf,
---- linux-2.6.20.orig/mm/swapfile.c
-+++ linux-2.6.20/mm/swapfile.c
+Index: linux/mm/swapfile.c
+===================================================================
+--- linux.orig/mm/swapfile.c
++++ linux/mm/swapfile.c
@@ -13,6 +13,10 @@
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-i386 new/patches.suse/kdb-i386
--- old/patches.suse/kdb-i386 2007-02-01 15:08:01.000000000 +0100
+++ new/patches.suse/kdb-i386 2007-02-14 02:37:48.000000000 +0100
@@ -1,21 +1,17 @@
From: Keith Owens
-Subject: Announce: kdb v4.4 is available for kernel 2.6.18
+Subject: kdb v4.4
Acked-by: schwab@suse.de
Patch-Mainline: never
-KDB (Linux Kernel Debugger) has been updated for kernel 2.6.18.
-
ftp://oss.sgi.com/projects/kdb/download/v4.4/
ftp://ftp.ocs.com.au/pub/mirrors/oss.sgi.com/projects/kdb/download/v4.4/
-Current versions are :-
-
- kdb-v4.4-2.6.20-rc7-i386-1
+kdb-v4.4-2.6.20-i386-1
---
arch/i386/Kconfig.debug | 78
arch/i386/Makefile | 1
arch/i386/Makefile.cpu | 1
- arch/i386/kdb/ChangeLog | 709 ++++
+ arch/i386/kdb/ChangeLog | 713 ++++
arch/i386/kdb/Makefile | 13
arch/i386/kdb/i386-dis.c | 4686 ++++++++++++++++++++++++++
arch/i386/kdb/kdb_cmds | 17
@@ -39,7 +35,7 @@
include/asm-i386/kmap_types.h | 3
include/asm-i386/mach-default/irq_vectors.h | 2
include/asm-i386/ptrace.h | 23
- 27 files changed, 14371 insertions(+), 3 deletions(-)
+ 27 files changed, 14375 insertions(+), 3 deletions(-)
Index: linux/arch/i386/Kconfig.debug
===================================================================
@@ -156,7 +152,11 @@
===================================================================
--- /dev/null
+++ linux/arch/i386/kdb/ChangeLog
-@@ -0,0 +1,709 @@
+@@ -0,0 +1,713 @@
++2007-02-06 Keith Owens
++
++ * kdb v4.4-2.6.20-i386-1.
++
+2007-02-01 Keith Owens
+
+ * kdb v4.4-2.6.20-rc7-i386-1.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-ia64 new/patches.suse/kdb-ia64
--- old/patches.suse/kdb-ia64 2007-02-01 15:08:01.000000000 +0100
+++ new/patches.suse/kdb-ia64 2007-02-14 02:37:48.000000000 +0100
@@ -1,20 +1,16 @@
From: Keith Owens
-Subject: Announce: kdb v4.4 is available for kernel 2.6.18
+Subject: kdb v4.4
Acked-by: schwab@suse.de
Patch-Mainline: never
-KDB (Linux Kernel Debugger) has been updated for kernel 2.6.18.
-
ftp://oss.sgi.com/projects/kdb/download/v4.4/
ftp://ftp.ocs.com.au/pub/mirrors/oss.sgi.com/projects/kdb/download/v4.4/
-Current versions are :-
-
- kdb-v4.4-2.6.20-rc7-ia64-1
+kdb-v4.4-2.6.20-ia64-1
---
arch/ia64/Kconfig.debug | 84
arch/ia64/Makefile | 1
- arch/ia64/kdb/ChangeLog | 767 +++
+ arch/ia64/kdb/ChangeLog | 771 +++
arch/ia64/kdb/Makefile | 21
arch/ia64/kdb/cpu-ia64-opc.c | 598 ++
arch/ia64/kdb/ia64-asmtab.c | 8585 ++++++++++++++++++++++++++++++++++++
@@ -45,7 +41,7 @@
include/asm-ia64/kdb_break.h | 24
include/asm-ia64/kdbprivate.h | 154
include/asm-ia64/sn/xpc.h | 1
- 33 files changed, 21873 insertions(+), 10 deletions(-)
+ 33 files changed, 21877 insertions(+), 10 deletions(-)
Index: linux/arch/ia64/Kconfig.debug
===================================================================
@@ -158,7 +154,11 @@
===================================================================
--- /dev/null
+++ linux/arch/ia64/kdb/ChangeLog
-@@ -0,0 +1,767 @@
+@@ -0,0 +1,771 @@
++2007-02-06 Keith Owens
++
++ * kdb v4.4-2.6.20-ia64-1.
++
+2007-02-01 Keith Owens
+
+ * kdb v4.4-2.6.20-rc7-ia64-1.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-x86_64 new/patches.suse/kdb-x86_64
--- old/patches.suse/kdb-x86_64 2007-02-01 15:08:02.000000000 +0100
+++ new/patches.suse/kdb-x86_64 2007-02-14 02:37:48.000000000 +0100
@@ -1,20 +1,16 @@
From: Keith Owens
-Subject: Announce: kdb v4.4 is available for kernel 2.6.18
+Subject: kdb v4.4
Acked-by: schwab@suse.de
Patch-Mainline: never
-KDB (Linux Kernel Debugger) has been updated for kernel 2.6.18.
-
ftp://oss.sgi.com/projects/kdb/download/v4.4/
ftp://ftp.ocs.com.au/pub/mirrors/oss.sgi.com/projects/kdb/download/v4.4/
-Current versions are :-
-
- kdb-v4.4-2.6.20-rc7-x86_64-1
+kdb-v4.4-2.6.20-x86_64-1
---
arch/x86_64/Kconfig.debug | 69
arch/x86_64/Makefile | 2
- arch/x86_64/kdb/ChangeLog | 281 ++
+ arch/x86_64/kdb/ChangeLog | 285 ++
arch/x86_64/kdb/Makefile | 13
arch/x86_64/kdb/kdb_cmds | 18
arch/x86_64/kdb/kdba_bp.c | 777 ++++++
@@ -33,7 +29,7 @@
include/asm-x86_64/kdb.h | 120
include/asm-x86_64/kdbprivate.h | 189 +
include/asm-x86_64/kdebug.h | 2
- 21 files changed, 13940 insertions(+), 3 deletions(-)
+ 21 files changed, 13944 insertions(+), 3 deletions(-)
Index: linux/arch/x86_64/Kconfig.debug
===================================================================
@@ -139,7 +135,11 @@
===================================================================
--- /dev/null
+++ linux/arch/x86_64/kdb/ChangeLog
-@@ -0,0 +1,281 @@
+@@ -0,0 +1,285 @@
++2007-02-06 Keith Owens
++
++ * kdb v4.4-2.6.20-x86_64-1.
++
+2007-02-01 Keith Owens
+
+ * kdb v4.4-2.6.20-rc7-x86_64-1.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-powerbook-touchpad-quirk.patch new/patches.suse/ppc-powerbook-touchpad-quirk.patch
--- old/patches.suse/ppc-powerbook-touchpad-quirk.patch 2007-02-07 08:33:52.000000000 +0100
+++ new/patches.suse/ppc-powerbook-touchpad-quirk.patch 2007-02-17 00:54:29.000000000 +0100
@@ -1,5 +1,6 @@
From: Sergey Vlasov
Subject: usbhid: Add HID_QUIRK_IGNORE_MOUSE flag
+Patch-mainline: yes
Some HID devices by Apple have both keyboard and mouse interfaces; the
keyboard interface is handled by usbhid, but the mouse (really
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/snd-aoa-device-symlinks.patch new/patches.suse/snd-aoa-device-symlinks.patch
--- old/patches.suse/snd-aoa-device-symlinks.patch 2006-12-01 23:37:48.000000000 +0100
+++ new/patches.suse/snd-aoa-device-symlinks.patch 2007-02-17 00:54:29.000000000 +0100
@@ -1,6 +1,7 @@
Subject: create sysfs device symlinks for snd-aoa
From: olh@suse.de
References: 106294
+Patch-mainline: yes
make hal happy, provide device symlinks for sound devices
make security happy, no need to put the default user in group audio
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
++++ 59511 lines of diff (skipped)
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-02-09 07:14:39.000000000 +0100
+++ kernel-source/series.conf 2007-02-17 00:54:37.919605000 +0100
@@ -152,8 +152,18 @@
patches.fixes/acpi_asus_do_not_always_load.patch
- # Fix new HP stuck/canceled ACPI processes (#226069)
-+trenn patches.fixes/acpi_execute_notify_threaded.patch
+
+ # Fix new HP (nx6125) stuck/canceled ACPI processes (#226069)
+ patches.fixes/acpi_execute_notify_threaded.patch
+
+ patches.fixes/acpi_fan-problem-fix.patch
+ patches.fixes/acpi-power-resources-resume-fix-2.patch
+ patches.fixes/acpi_force-fan-active.patch
+
+ patches.fixes/psmouse-fiddle-with-reset.patch
+ patches.fixes/serio-cleanup-to-bus_2.patch
+
+ patches.fixes/cpufreq_speedstep_acpi_nodefault.patch
patches.suse/apm_setup_UP.diff
@@ -242,6 +252,7 @@
+hare patches.drivers/ide-acpi-support
+hare patches.drivers/libata-acpi-update
+ patches.drivers/e1000-eeprom-cksum.patch
########################################################
# Storage
@@ -440,70 +451,65 @@
# re-basing to a newer xen tree.
# split out patches
-+2620 patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
-+2620 patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
-+2620 patches.xen/blktap-aio-16_03_06.patch
-+2620 patches.xen/fix-ide-cd-pio-mode.patch
-+2620 patches.xen/i386-mach-io-check-nmi.patch
-+2620 patches.xen/net-csum.patch
-+2620 patches.xen/pmd-shared.patch
-+2620 patches.xen/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
-+ignore patches.xen/xen-hotplug.patch
-+2620 patches.xen/xenoprof-generic.patch
+ patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch
+ patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
+ patches.xen/blktap-aio-16_03_06.patch
+ patches.xen/fix-ide-cd-pio-mode.patch
+ patches.xen/i386-mach-io-check-nmi.patch
+ patches.xen/net-csum.patch
+ patches.xen/pmd-shared.patch
+ patches.xen/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
+ patches.xen/xenoprof-generic.patch
+ patches.xen/softlockup-no-idle-hz.patch
# bulk stuff, new files for xen
-+2620 patches.xen/xen3-auto-xen-arch.diff
-+2620 patches.xen/xen3-auto-xen-drivers.diff
-+2620 patches.xen/xen3-auto-include-xen-interface.diff
+ patches.xen/xen3-auto-xen-arch.diff
+ patches.xen/xen3-auto-xen-drivers.diff
+ patches.xen/xen3-auto-include-xen-interface.diff
# kconfig bits for xen
patches.xen/xen3-auto-xen-kconfig.diff
# common code changes
-+2620 patches.xen/xen3-auto-common.diff
-+2620 patches.xen/xen3-auto-arch-i386.diff
+ patches.xen/xen3-auto-common.diff
+ patches.xen/xen3-auto-arch-i386.diff
+empty patches.xen/xen3-auto-arch-um.diff
-+2620 patches.xen/xen3-auto-arch-x86_64.diff
+ patches.xen/xen3-auto-arch-x86_64.diff
# newer changeset backports
# changes outside arch/{i386,x86_64}/xen
-+2620 patches.xen/xen3-fixup-common
-+2620 patches.xen/xen3-fixup-arch-i386
+ patches.xen/xen3-fixup-common
+ patches.xen/xen3-fixup-arch-i386
+empty patches.xen/xen3-fixup-arch-um
-+2620 patches.xen/xen3-fixup-arch-x86_64
+ patches.xen/xen3-fixup-arch-x86_64
# ports of other patches
-+2620 patches.xen/xen3-patch-2.6.17
-+2620 patches.xen/xen3-patch-2.6.18
-+2620 patches.xen/xen3-patch-2.6.19
-+2620 patches.xen/xen3-patch-2.6.20-rc6
-+2620 patches.xen/xen3-sysfs-crash-debugging.patch
+ patches.xen/xen3-patch-2.6.17
+ patches.xen/xen3-patch-2.6.18
+ patches.xen/xen3-patch-2.6.19
+ patches.xen/xen3-patch-2.6.20
+ patches.xen/xen3-dynamic-kernel-command-line-i386.patch
+ patches.xen/xen3-dynamic-kernel-command-line-x86_64.patch
+ patches.xen/xen3-i386-2048-byte-command-line.patch
+ patches.xen/xen3-sysfs-crash-debugging.patch
+andrea patches.xen/xen3-silent-stack-overflow
# bugfixes
-+2620 patches.xen/xen-balloon-min
-+2620 patches.xen/xen-modular-blktap
+ patches.xen/xen-balloon-min
+ patches.xen/xen-modular-blktap
# enhancements
-+2620 patches.xen/xen-x86-panic-no-reboot
-+2620 patches.xen/xen-i386-panic-on-oops
-+2620 patches.xen/xen-x86-kconfig-no-cpu_freq
-+2620 patches.xen/xen-configurable-console
-+2620 patches.xen/xen-x86_64-init-cleanup
-+2620 patches.xen/xen-balloon-max-target
-+2620 patches.xen/xen-x86-dcr-fallback
-+2620 patches.xen/xen-x86-consistent-nmi
-+2620 patches.xen/xen-x86-no-lapic
-+2620 patches.xen/xen-no-video-select
-+2620 patches.xen/xen-i386-highpte
-+2620 patches.xen/xen-i386-pae-bits
-+2620 patches.xen/xen-protocol-bimodal
-+2620 patches.xen/xen-blkback-bimodal
-+2620 patches.xen/xen-blkback-bimodal-suse
-+2620 patches.xen/xen-blkfront-bimodal
-+2620 patches.xen/xen-fbfront-bimodal
-+2620 patches.xen/xen-export-xenbus_strstate
-
- # longer commandline
-+2620 patches.xen/dynamic-kernel-command-xen.patch
+ patches.xen/xen-x86-panic-no-reboot
+ patches.xen/xen-i386-panic-on-oops
+ patches.xen/xen-x86-kconfig-no-cpu_freq
+ patches.xen/xen-configurable-console
+ patches.xen/xen-x86_64-init-cleanup
+ patches.xen/xen-balloon-max-target
+ patches.xen/xen-x86-dcr-fallback
+ patches.xen/xen-x86-consistent-nmi
+ patches.xen/xen-x86-no-lapic
+ patches.xen/xen-no-video-select
+ patches.xen/xen-blkback-bimodal-suse
+ patches.xen/xen-pvfb-split-kbd-ptr
+ patches.xen/xen-console-default
++++++ supported.conf ++++++
--- kernel-source/supported.conf 2007-02-09 07:15:00.000000000 +0100
+++ kernel-source/supported.conf 2007-02-17 00:54:55.216291000 +0100
@@ -222,7 +222,8 @@
- kernel/drivers/char/tpm/tpm_bios
- kernel/drivers/char/tpm/tpm_infineon
- kernel/drivers/char/tpm/tpm_nsc
- kernel/drivers/char/tpm/tpm_xen
+- kernel/drivers/char/tpm/tpm_tis
+- kernel/drivers/char/tpm/tpm_xenu
kernel/drivers/char/watchdog/acquirewdt # Acquire Inc. Single Board Computer Watchdog Timer driver
kernel/drivers/char/watchdog/advantechwdt # Advantech Single Board Computer WDT driver
kernel/drivers/char/watchdog/alim1535_wdt # ALi M1535 PMU Watchdog Timer driver
@@ -1281,12 +1282,13 @@
kernel/drivers/xen/blkback/blkbk # Xen block device backend
kernel/drivers/xen/blktap/blkbktap # Xen TAP block device backend
kernel/drivers/xen/blkfront/xenblk # Xen block device frontend
+ kernel/drivers/xen/fbfront/xenfb # Xen virtual frame buffer frontend
+ kernel/drivers/xen/fbfront/xenkbd # Xen virtual keyboard frontend
kernel/drivers/xen/netback/netbk # Xen network device backend
kernel/drivers/xen/netback/netloop # Xen network loopback device
kernel/drivers/xen/netfront/xennet # Xen network device frontend
- kernel/drivers/xen/pciback/pciback # Xen PCI device backend
- kernel/drivers/xen/tpmback/tpmbk # Xen TPM device backend
- kernel/drivers/xen/tpmfront/tpmfront # Xen TPM device frontend
+- kernel/drivers/xen/tpmback/tpmbk # Xen TPM device backend
kernel/drivers/xen/xenbus/xenbus_be # Xen XenBus backend driver support module
- kernel/fs/9p/9p2000
- kernel/fs/adfs/adfs
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org