SPECS: kernel-vanilla.spec - bcond prempt-nort kernel build

[shadzik]

Author: shadzik                      Date: Tue Nov 21 16:47:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond prempt-nort kernel build

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.4 SPECS/kernel-vanilla.spec:1.5
--- SPECS/kernel-vanilla.spec:1.4	Tue Nov 21 12:44:00 2006
+++ SPECS/kernel-vanilla.spec	Tue Nov 21 17:47:47 2006
@@ -7,6 +7,7 @@
 
 %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
 
 %{?debug:%define with_verbose 1}
 
@@ -72,8 +73,10 @@
 Source24:	kernel-vanilla-x86_64-smp.config
 Source25:	kernel-vanilla-ppc.config
 Source26:	kernel-vanilla-ppc-smp.config
-Source27:	kernel-vanilla-preempt-nort.config
-Source28:	kernel-vanilla-netfilter.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
@@ -590,8 +593,12 @@
 
 	TuneUpConfigForIX86 .config "$smp"
 
-	cat %{SOURCE27} >> .config
-	cat %{SOURCE28} >> .config
+	%if %{with preempt-nort}
+		cat %{SOURCE40} >> .config
+	%else
+		cat %{SOURCE40} >> .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}
@@ -1149,6 +1156,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/21 16:47:47  shadzik
+- bcond prempt-nort kernel build
+
 Revision 1.4  2006/11/21 11:44:00  paszczus
 - adaptarized
 
================================================================

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