SPECS (hawk-LINUX_2_6): kernel.spec - configs for vserver and grse...

hawk hawk at pld-linux.org
Sun Jan 28 12:02:18 CET 2007


Author: hawk                         Date: Sun Jan 28 11:02:18 2007 GMT
Module: SPECS                         Tag: hawk-LINUX_2_6
---- Log message:
- configs for vserver and grsecurity

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1701.2.2 -> 1.441.2.1701.2.3) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1701.2.2 SPECS/kernel.spec:1.441.2.1701.2.3
--- SPECS/kernel.spec:1.441.2.1701.2.2	Sat Jan 27 15:05:37 2007
+++ SPECS/kernel.spec	Sun Jan 28 12:02:13 2007
@@ -111,6 +111,8 @@
 Source40:	kernel-preempt-nort.config
 Source41:	kernel-no-preempt-nort.config
 Source42:	kernel-netfilter.config
+Source43:	kernel-vserver.config
+Source44:	kernel-grsec.config
 
 # http://vserver.13thfloor.at/Experimental/patch-2.6.19.2-vs2.3.0.7.diff
 Patch100:	linux-2.6-vs2.3.patch
@@ -691,6 +693,14 @@
 	%endif
 	cat %{SOURCE42} >> .config
 
+	%if %{with vserver}
+	cat %{SOURCE43} >> arch/%{_target_base_arch}/defconfig
+	%endif
+
+	%if %{with grsecurity}
+	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
+	%endif
+
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" .config}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" .config}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" .config}
@@ -1327,6 +1337,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1701.2.3  2007/01/28 11:02:13  hawk
+- configs for vserver and grsecurity
+
 Revision 1.441.2.1701.2.2  2007/01/27 14:05:37  hawk
 - killed %{alt_kernel} macro
 - added patches to spec, but not added/adjusted in CVS yet
================================================================

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



More information about the pld-cvs-commit mailing list