SPECS (LINUX_2_6): kernel.spec - enabled grsec_minimal patching - ...

[baggins]

Author: baggins                      Date: Sun May  7 20:18:56 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- enabled grsec_minimal patching
- added pae bcond for building PAE kernel on uniprocessor

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1534 -> 1.441.2.1535) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1534 SPECS/kernel.spec:1.441.2.1535
--- SPECS/kernel.spec:1.441.2.1534	Sun May  7 12:38:59 2006
+++ SPECS/kernel.spec	Sun May  7 22:18:50 2006
@@ -14,6 +14,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	xen0		# added Xen0 support
 %bcond_with	xenU		# added XenU support
+%bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_without	grsecurity	# don't build grsecurity at all
 %bcond_without	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
 
@@ -247,7 +248,6 @@
 
 # grsecurity snap for 2.6.16.14
 # based on http://www.grsecurity.net/~spender/grsecurity-2.1.9-2.6.16.14-200605060936.patch
-
 Patch9999:	grsecurity-2.1.9-2.6.16.14.patch
 
 URL:		http://www.kernel.org/
@@ -755,7 +755,7 @@
 %endif
 
 %if %{with grsec_minimal}
-#%%patch1000 -p1
+%patch1000 -p1
 %endif
 %if %{with grsec_full}
 %patch9999 -p1
@@ -770,8 +770,11 @@
 %build
 TuneUpConfigForIX86 () {
 %ifarch %{ix86}
-	smp=
-	[ "$2" = "yes" ] && smp=yes
+	pae=
+	[ "$2" = "yes" ] && pae=yes
+	%if %{with pae}
+	pae=yes
+	%endif
 	%ifnarch i386
 	sed -i 's:CONFIG_M386=y:# CONFIG_M386 is not set:' $1
 	%endif
@@ -794,7 +797,7 @@
 	sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
 	%endif
 	%ifarch i686 athlon pentium3 pentium4
-	if [ "$smp" = "yes" ]; then
+	if [ "$pae" = "yes" ]; then
 		sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
 		sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
 	fi
@@ -1588,6 +1591,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1535  2006/05/07 20:18:50  baggins
+- enabled grsec_minimal patching
+- added pae bcond for building PAE kernel on uniprocessor
+
 Revision 1.441.2.1534  2006/05/07 10:38:59  zbyniu
 - grsecurity-2.1.9-2.6.16.14.patch not conflicting with vserver; rel 0.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1534&r2=1.441.2.1535&f=u