SPECS (LINUX_2_6): kernel.spec - force w/o abi grsec vserver tuxon...

[zbyniu]

Author: zbyniu                       Date: Wed Mar 12 19:44:57 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- force w/o abi grsec vserver tuxonice if with rescuecd

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1848 -> 1.441.2.1849) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1848 SPECS/kernel.spec:1.441.2.1849
--- SPECS/kernel.spec:1.441.2.1848	Wed Mar 12 03:00:38 2008
+++ SPECS/kernel.spec	Wed Mar 12 20:44:52 2008
@@ -88,9 +88,13 @@
 %define		have_sound	1
 
 %if %{with rescuecd}
+%undefine	with_abi
+%undefine	with_tuxonice
 %undefine	with_grsec_full
+%undefine	with_grsec_minimal
 %undefine	with_pax
 %undefine	with_pax_full
+%undefine	with_vserver
 %define		have_drm	0
 %define		have_sound	0
 %endif
@@ -1083,8 +1087,6 @@
 	sed -i "s:CONFIG_DEBUG_KERNEL=.:# CONFIG_DEBUG_KERNEL is not set:" $1
 	sed -i "s:CONFIG_ISDN=.:# CONFIG_ISDN is not set:" $1
 	sed -i "s:CONFIG_AGP\(.*\)=.:# CONFIG_AGP\1 is not set:" $1
-	sed -i "s:CONFIG_GRKERNSEC=.:# CONFIG_GRKERNSEC is not set:" $1
-	sed -i "s:CONFIG_VSERVER\(.*\)=.:# CONFIG_VSERVER\1 is not set:" $1
 	sed -i "s:CONFIG_SECURITY=.:# CONFIG_SECURITY is not set:" $1
 }
 
@@ -1620,7 +1622,7 @@
 %{_kernelsrcdir}/crypto
 %{_kernelsrcdir}/drivers
 %{_kernelsrcdir}/fs
-%if %{with grsecurity}
+%if %{with grsecurity} && %{without rescuecd}
 %{_kernelsrcdir}/grsecurity
 %endif
 %{_kernelsrcdir}/init
@@ -1655,6 +1657,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1849  2008-03-12 19:44:52  zbyniu
+- force w/o abi grsec vserver tuxonice if with rescuecd
+
 Revision 1.441.2.1848  2008-03-12 02:00:38  zbyniu
 - idea: build kernel for rescuecd from this spec (as rescuecd bcond)
 - first steps, builds, not tested
================================================================

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