packages: kernel/kernel.spec - PAE is now ON by default on i686 athlon pent...

[arekm]

Author: arekm                        Date: Sun Dec 11 21:41:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- PAE is now ON by default on i686 athlon pentium3 pentium4. Please use i486 kernel if your 32bit CPU doesn't support PAE.

---- Files affected:
packages/kernel:
   kernel.spec (1.1004 -> 1.1005) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.1004 packages/kernel/kernel.spec:1.1005
--- packages/kernel/kernel.spec:1.1004	Wed Dec  7 21:40:28 2011
+++ packages/kernel/kernel.spec	Sun Dec 11 22:41:47 2011
@@ -32,7 +32,7 @@
 %bcond_with	pax		# build pax and grsecurity (ie. grsecurity && pax)
 
 %bcond_with	fbcondecor	# build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
-%bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
+%bcond_without	pae		# build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
 %bcond_with	nfsroot		# build with root on NFS support
 
 %bcond_without	imq		# imq support
@@ -100,7 +100,7 @@
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
 # alt_kernel should be defined if __alt_kernel has non-empty value (for %{?alt_kernel:foo} constructs)
-%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
+%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}
 
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
@@ -305,6 +305,11 @@
 Requires:	coreutils
 Requires:	geninitrd >= 10000-3
 Requires:	module-init-tools >= %{module_init_tools_ver}
+%if %{with pae}
+%ifarch i686 athlon pentium3 pentium4
+Requires:	cpuinfo(pae)
+%endif
+%endif
 Suggests:	keyutils
 Provides:	%{name}(netfilter) = 20070806
 Provides:	%{name}(vermagic) = %{kernel_release}
@@ -341,11 +346,7 @@
 Conflicts:	util-linux < 2.10o
 Conflicts:	util-vserver < 0.30.216
 Conflicts:	xfsprogs < 2.6.0
-%if %{with pae}
-ExcludeArch:	i386 i486 i586
-%else
 ExclusiveArch:	%{ix86} %{x8664} alpha arm ia64 ppc ppc64 sparc sparc64
-%endif
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -1504,6 +1505,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1005  2011/12/11 21:41:47  arekm
+- PAE is now ON by default on i686 athlon pentium3 pentium4. Please use i486 kernel if your 32bit CPU doesn't support PAE.
+
 Revision 1.1004  2011/12/07 20:40:28  arekm
 Use initramfs, initrd is deprecated for long time in kernel.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.1004&r2=1.1005&f=u