SPECS (LINUX_2_6): kernel.spec - better conditions for pax/no-pax ...

[zbyniu]

Author: zbyniu                       Date: Wed Apr 23 09:58:22 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- better conditions for pax/no-pax & tuxonice configs

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1880 -> 1.441.2.1881) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1880 SPECS/kernel.spec:1.441.2.1881
--- SPECS/kernel.spec:1.441.2.1880	Wed Apr 23 11:40:54 2008
+++ SPECS/kernel.spec	Wed Apr 23 11:58:16 2008
@@ -68,6 +68,10 @@
 %if %{with grsec_full}
 %undefine	with_grsec_minimal
 %define		with_grsecurity		1
+%if %{with pax}
+%define		with_pax_full		1
+%undefine	with_pax
+%endif
 %endif
 
 %if %{with grsec_minimal}
@@ -1134,12 +1138,14 @@
 
 # tuxonice
 %if %{with tuxonice}
+%ifarch {ix86} %{x8664} ia64 ppc ppc64
 	cat %{SOURCE42} >> %{defconfig}
 %endif
-
 %ifarch ppc ppc64
-	sed -i "s:CONFIG_SUSPEND2=y:# CONFIG_SUSPEND2 is not set:" %{defconfig}
+	sed -i "s:CONFIG_TOI=y:# CONFIG_TOI is not set:" %{defconfig}
+%endif
 %endif
+
 %if %{with vserver}
 	cat %{SOURCE43} >> %{defconfig}
 %if %{with vs22}
@@ -1162,6 +1168,7 @@
 
 %if %{with grsec_full}
 	cat %{SOURCE45} >> %{defconfig}
+	cat %{SOURCE50} >> %{defconfig}
 %else
 %if %{with grsec_minimal}
 	cat %{SOURCE51} >> %{defconfig}
@@ -1171,8 +1178,6 @@
 %if %{with pax}
 	cat %{SOURCE49} >> %{defconfig}
 	PaXconfig %{defconfig}
-%else
-	cat %{SOURCE50} >> %{defconfig}
 %endif
 
 %endif
@@ -1221,11 +1226,9 @@
 	echo "CONFIG_ROOT_NFS=y" >> %{defconfig}
 %endif
 
-%ifarch %{ix86}
 %if %{with abi}
 	cat %{SOURCE34} >> %{defconfig}
 %endif
-%endif
 
 %if %{with rescuecd}
 	RescueConfig %{defconfig}
@@ -1705,6 +1708,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1881  2008-04-23 09:58:16  zbyniu
+- better conditions for pax/no-pax & tuxonice configs
+
 Revision 1.441.2.1880  2008-04-23 09:40:54  glen
 - better explanation (English)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1880&r2=1.441.2.1881&f=u