diff --git a/config.conf b/config.conf index 624c7563..e9a01cac 100644 --- a/config.conf +++ b/config.conf @@ -6,8 +6,8 @@ # kernel-binary and kernel-source rely on this # -+i386 i386/legacy +i386 i386/default ++i386 i386/pae +i386 i386/debug +i386 i386/xen +i386 i386/vanilla diff --git a/config.tar.bz2 b/config.tar.bz2 index 106674c0..75c944f7 100644 --- a/config.tar.bz2 +++ b/config.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e018e1906bc3f772ab52c0e3b584b5ba69e4b337a4040b0bef45fc30ac8b0a90 -size 146664 +oid sha256:7b0c6d0d9d1a9f2aad0f355b7009b54fc84a92c2ee58faa9add7e8f7dbb589e1 +size 146640 diff --git a/kernel-debug.changes b/kernel-debug.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 26c89f4e..295af7e6 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -62,7 +62,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -790,6 +790,9 @@ kernel module packages) against the -debug flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-default.changes b/kernel-default.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 6754b338..6ab3df4f 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -62,7 +62,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -122,8 +122,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel %ifarch %ix86 -Provides: smp kernel-smp kernel-pae kernel-bigsmp -Obsoletes: smp kernel-smp kernel-pae kernel-bigsmp +Provides: smp kernel-smp +Obsoletes: smp kernel-smp %endif %ifarch ia64 Provides: kernel-sn2 @@ -802,6 +802,9 @@ kernel module packages) against the -default flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-kdump.changes b/kernel-kdump.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-kdump.changes +++ b/kernel-kdump.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-kdump.spec b/kernel-kdump.spec index 224ec122..030f1673 100644 --- a/kernel-kdump.spec +++ b/kernel-kdump.spec @@ -62,7 +62,7 @@ Name: kernel-kdump Summary: kernel for kdump Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -798,6 +798,9 @@ kernel module packages) against the -kdump flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-legacy.changes b/kernel-pae.changes similarity index 99% rename from kernel-legacy.changes rename to kernel-pae.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-legacy.changes +++ b/kernel-pae.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-legacy.spec b/kernel-pae.spec similarity index 99% rename from kernel-legacy.spec rename to kernel-pae.spec index 7d0b8cdf..7cd3a276 100644 --- a/kernel-legacy.spec +++ b/kernel-pae.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-legacy (Version 2.6.30) +# spec file for package kernel-pae (Version 2.6.30) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ # macro to add the source timestamp to package descriptions %define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :) # Don't use shell commands in build macros, this won't work outside of rpm -%define build_flavor legacy +%define build_flavor pae %define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen") %define build_vanilla (%build_flavor == "vanilla") @@ -59,10 +59,10 @@ %define install_vdso 0 %endif -Name: kernel-legacy -Summary: The Standard Kernel +Name: kernel-pae +Summary: Kernel with PAE Support Version: 2.6.30 -Release: 3 +Release: 1 %if %using_buildservice %else %endif @@ -121,6 +121,10 @@ Conflicts: lvm2 < 2.02.33 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel +%ifarch %ix86 +Provides: kernel-bigsmp +Obsoletes: kernel-bigsmp +%endif Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -198,7 +202,14 @@ Obsoletes: ralink-rt2860-kmp %define tolerate_kabi_changes 6 %description -The standard kernel for both uniprocessor and multiprocessor systems. +This kernel supports up to 64GB of main memory. It requires Physical +Addressing Extensions (PAE), which were introduced with the Pentium Pro +processor. + +PAE is not only more physical address space but also important for the +"no execute" feature which disables execution of code that is marked as +non-executable. Therefore, the PAE kernel should be used on any systems +that support it, regardless of the amount of main memory. @@ -659,7 +670,7 @@ done %defattr(-, root, root) %package base -Summary: Base Modules of the Legacy Kernel +Summary: Kernel with PAE Support - base modules License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -674,9 +685,14 @@ Conflicts: libc.so.6()(64bit) %endif %description base -The kernel for both uniprocessor and multiprocessor systems to run on -older hardware. It contains support for ISA devices and has the -Physical Addressing Extension (PAE) feature disabled. +This kernel supports up to 64GB of main memory. It requires Physical +Addressing Extensions (PAE), which were introduced with the Pentium Pro +processor. + +PAE is not only more physical address space but also important for the +"no execute" feature which disables execution of code that is marked as +non-executable. Therefore, the PAE kernel should be used on any systems +that support it, regardless of the amount of main memory. This package contains only the base modules, required in all installs. @@ -697,7 +713,7 @@ This package contains only the base modules, required in all installs. %endif %package extra -Summary: Extra Modules for the Legacy Kernel +Summary: Kernel with PAE Support - extra modules License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -715,9 +731,14 @@ Conflicts: libc.so.6()(64bit) %endif %description extra -The kernel for both uniprocessor and multiprocessor systems to run on -older hardware. It contains support for ISA devices and has the -Physical Addressing Extension (PAE) feature disabled. +This kernel supports up to 64GB of main memory. It requires Physical +Addressing Extensions (PAE), which were introduced with the Pentium Pro +processor. + +PAE is not only more physical address space but also important for the +"no execute" feature which disables execution of code that is marked as +non-executable. Therefore, the PAE kernel should be used on any systems +that support it, regardless of the amount of main memory. This package contains additional modules not supported by Novell. @@ -740,13 +761,18 @@ This package contains additional modules not supported by Novell. %package man License: GPL v2 only -Summary: The Legacy Kernel +Summary: Kernel with PAE Support Group: System/Kernel %description man -The kernel for both uniprocessor and multiprocessor systems to run on -older hardware. It contains support for ISA devices and has the -Physical Addressing Extension (PAE) feature disabled. +This kernel supports up to 64GB of main memory. It requires Physical +Addressing Extensions (PAE), which were introduced with the Pentium Pro +processor. + +PAE is not only more physical address space but also important for the +"no execute" feature which disables execution of code that is marked as +non-executable. Therefore, the PAE kernel should be used on any systems +that support it, regardless of the amount of main memory. @@ -766,7 +792,7 @@ AutoReqProv: on %description devel This package contains files necessary for building kernel modules (and -kernel module packages) against the -legacy flavor of the kernel. +kernel module packages) against the -pae flavor of the kernel. @@ -792,6 +818,9 @@ kernel module packages) against the -legacy flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index 0d279ca5..1b84b31b 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -62,7 +62,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -853,6 +853,9 @@ Authors: %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-ps3.changes b/kernel-ps3.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 57efee39..c45f2728 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -62,7 +62,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -792,6 +792,9 @@ kernel module packages) against the -default flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-s390.changes b/kernel-s390.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-s390.spec b/kernel-s390.spec index 3b32fdcb..e0b06949 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -62,7 +62,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -790,6 +790,9 @@ kernel module packages) against the -s390 flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-source.changes b/kernel-source.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 9c16454d..0f6045db 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -42,7 +42,7 @@ Url: http://www.kernel.org/ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -235,6 +235,9 @@ done %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-syms.changes b/kernel-syms.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index 649beabb..d5615fd1 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -33,7 +33,7 @@ Url: http://www.kernel.org/ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) @@ -52,7 +52,7 @@ Requires: kernel-default-devel = %version-%source_rel Requires: kernel-kdump-devel = %version-%source_rel %endif %ifarch %ix86 -Requires: kernel-legacy-devel = %version-%source_rel +Requires: kernel-pae-devel = %version-%source_rel %endif %ifarch ppc ppc64 Requires: kernel-ppc64-devel = %version-%source_rel @@ -102,6 +102,9 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %_docdir/%name/README.SUSE %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-trace.changes b/kernel-trace.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-trace.spec b/kernel-trace.spec index b1804b54..aeb4bc0f 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -62,7 +62,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -812,6 +812,9 @@ Authors: %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 8912a41e..36220768 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -62,7 +62,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -790,6 +790,9 @@ kernel module packages) against the -vanilla flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/kernel-xen.changes b/kernel-xen.changes index 9f5aa32d..ac8f1ee2 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 25 14:11:04 CEST 2009 - mmarek@suse.cz + +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 + ------------------------------------------------------------------- Sun May 24 10:36:18 CEST 2009 - mmarek@suse.cz diff --git a/kernel-xen.spec b/kernel-xen.spec index 8a60941d..5c72270d 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -62,7 +62,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 2.6.30 -Release: 3 +Release: 4 %if %using_buildservice %else %endif @@ -798,6 +798,9 @@ kernel module packages) against the -xen flavor of the kernel. %endif %changelog +* Mon May 25 2009 mmarek@suse.cz +- switch i386 flavors back to -default (non-pae) and -pae for + milestone2 * Sun May 24 2009 mmarek@suse.cz - rpm/find-provides: fix for kernel-kdump. * Sat May 23 2009 mmarek@suse.cz diff --git a/old-packages.conf b/old-packages.conf index 6859f688..c3c43bb9 100644 --- a/old-packages.conf +++ b/old-packages.conf @@ -15,7 +15,9 @@ # # i386 ================================================================= -+i386 -!default smp kernel-smp kernel-pae kernel-bigsmp ++i386 -!default smp kernel-smp + ++i386 -!pae kernel-bigsmp # x86_64 =============================================================== +x86_64 -!default smp kernel-smp diff --git a/package-descriptions b/package-descriptions index eafec339..0aa37fec 100644 --- a/package-descriptions +++ b/package-descriptions @@ -20,13 +20,6 @@ The Standard Kernel The standard kernel for both uniprocessor and multiprocessor systems. -=== kernel-legacy === -The Legacy Kernel - -The kernel for both uniprocessor and multiprocessor systems to run on older -hardware. It contains support for ISA devices and has the Physical Addressing -Extension (PAE) feature disabled. - === kernel-kdump === kernel for kdump @@ -35,6 +28,18 @@ bootloader, the kexec tool has to be used to load it. Once the system crashes, the loaded kernel will be started to grab debug info from the crashed kernel. +=== kernel-pae === +Kernel with PAE Support + +This kernel supports up to 64GB of main memory. It requires Physical +Addressing Extensions (PAE), which were introduced with the Pentium Pro +processor. + +PAE is not only more physical address space but also important for the +"no execute" feature which disables execution of code that is marked as +non-executable. Therefore, the PAE kernel should be used on any systems +that support it, regardless of the amount of main memory. + === kernel-ppc64 === Kernel for ppc64 Systems diff --git a/source-timestamp b/source-timestamp index abad5da6..a1a520b1 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2009-05-24 10:36:30 +0200 -GIT Revision: b74f2b51e1f325297f352ba2ee9648782e4516d7 +2009-05-25 14:11:59 +0200 +GIT Revision: 6580dd3e9ae59976b902a43cb1407cc863f22b9e GIT Branch: master