packages (LINUX_2_6_38): kernel/kernel.spec - PAE is now ON by default on i...

[glen]

Author: glen                         Date: Sun May 20 16:31:06 2012 GMT
Module: packages                      Tag: LINUX_2_6_38
---- 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.924.2.13 -> 1.924.2.14) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.924.2.13 packages/kernel/kernel.spec:1.924.2.14
--- packages/kernel/kernel.spec:1.924.2.13	Fri Feb  3 00:43:43 2012
+++ packages/kernel/kernel.spec	Sun May 20 18:31:01 2012
@@ -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
@@ -113,7 +113,7 @@
 %if %{with rescuecd}
 %define		alt_kernel	rescuecd
 %else # not rescuecd:
-%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
+%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{!?with_pae:nopae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
@@ -346,6 +346,11 @@
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 10000-3
 Requires(post):	module-init-tools >= 0.9.9
+%if %{with pae}
+%ifarch i686 athlon pentium3 pentium4
+Requires:	cpuinfo(pae)
+%endif
+%endif
 Requires:	/sbin/depmod
 Requires:	coreutils
 Requires:	geninitrd >= 10000-3
@@ -383,11 +388,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)
 
@@ -1578,6 +1579,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.924.2.14  2012/05/20 16:31:01  glen
+- 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.924.2.13  2012/02/02 23:43:43  glen
 - suggest linux-firmware to locate firmware for bnx2 drivers, like bnx2/bnx2-mips-06-6.2.1.fw
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/kernel/kernel.spec?r1=1.924.2.13&r2=1.924.2.14