Author: arekm Date: Wed Dec 14 17:59:34 2011 GMT
Module: packages Tag: LINUX_3_0
---- Log message:
---- Files affected:
packages/kernel:
kernel.spec (1.987.2.18 -> 1.987.2.19)
---- Diffs:
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.987.2.18
packages/kernel/kernel.spec:1.987.2.19
--- packages/kernel/kernel.spec:1.987.2.18 Fri Dec 9 21:20:44 2011
+++ packages/kernel/kernel.spec Wed Dec 14 18:59:29 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
@@ -114,7 +114,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}
%if "%{__alt_kernel}" != ""
%define alt_kernel %{__alt_kernel}
%endif
@@ -322,6 +322,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}
@@ -358,11 +363,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)
@@ -1534,6 +1535,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.987.2.19 2011/12/14 17:59:29 arekm
+*** empty log message ***
+
Revision 1.987.2.18 2011/12/09 20:20:44 arekm
- up to 3.0.13
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.18&r2=1.987.2.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
