SPECS (Titanium): kernel-vanilla.spec - killed additional .config ...

hawk hawk at pld-linux.org
Sat Nov 10 16:32:39 CET 2007


Author: hawk                         Date: Sat Nov 10 15:32:39 2007 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- killed additional .config files, keep everything in one config for
  easier updates

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.43.2.11.2.3 -> 1.43.2.11.2.4) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.3 SPECS/kernel-vanilla.spec:1.43.2.11.2.4
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.3	Sat Nov 10 15:34:39 2007
+++ SPECS/kernel-vanilla.spec	Sat Nov 10 16:32:33 2007
@@ -2,7 +2,6 @@
 #
 # Conditional build:
 %bcond_without	source		# don't build kernel-source package
-
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	preempt-nort	# build preemptable no realtime kernel
@@ -80,10 +79,6 @@
 Source20:	kernel-vanilla-i386.config
 Source21:	kernel-vanilla-x86_64.config
 
-Source40:	kernel-vanilla-preempt-nort.config
-Source41:	kernel-vanilla-no-preempt-nort.config
-Source42:	kernel-vanilla-netfilter.config
-
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
 BuildRequires:	gcc >= 5:3.2
@@ -448,11 +443,10 @@
 	TuneUpConfigForIX86 .config
 
 	%if %{with preempt-nort}
-		cat %{SOURCE40} >> .config
-	%else
-		cat %{SOURCE41} >> .config
+	    sed -i "s:CONFIG_PREEMPT_NONE=y:# CONFIG_PREEMPT_NONE is not set:" .config
+	    sed -i "s:# CONFIG_PREEMPT is not set:CONFIG_PREEMPT=y:" .config
+	    sed -i "s:# CONFIG_PREEMPT_BKL is not set:CONFIG_PREEMPT_BKL=y:" .config
 	%endif
-	cat %{SOURCE42} >> .config
 
 %{?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}
@@ -836,6 +830,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43.2.11.2.4  2007/11/10 15:32:33  hawk
+- killed additional .config files, keep everything in one config for
+  easier updates
+
 Revision 1.43.2.11.2.3  2007/11/10 14:34:39  hawk
 - fixed %define Features
 
================================================================

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



More information about the pld-cvs-commit mailing list