SPECS (Titanium): kernel-vanilla.spec - fixed preempt build - fixe...

[hawk]

Author: hawk                         Date: Sat Nov 10 21:18:10 2007 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- fixed preempt build
- fixed kernel localversion

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.43.2.11.2.7 -> 1.43.2.11.2.8) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.43.2.11.2.7 SPECS/kernel-vanilla.spec:1.43.2.11.2.8
--- SPECS/kernel-vanilla.spec:1.43.2.11.2.7	Sat Nov 10 20:32:31 2007
+++ SPECS/kernel-vanilla.spec	Sat Nov 10 22:18:04 2007
@@ -4,7 +4,7 @@
 %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
+%bcond_with	preempt		# build preemptable no realtime kernel
 
 %{?debug:%define with_verbose 1}
 
@@ -438,11 +438,12 @@
 
 	echo "" > .config
 	cat $RPM_SOURCE_DIR/kernel-vanilla-$Config.config >> .config
-	echo "CONFIG_LOCALVERSION=\"-%{_localversion}smp\"" >> .config
+	echo "CONFIG_LOCALVERSION=\"-%{_localversion}\"" >> .config
 
 	TuneUpConfigForIX86 .config
 
-	%if %{with preempt-nort}
+	%if %{with preempt}
+	    echo "# CONFIG_DEBUG_PREEMPT is not set" >> .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
@@ -830,6 +831,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43.2.11.2.8  2007/11/10 21:18:04  hawk
+- fixed preempt build
+- fixed kernel localversion
+
 Revision 1.43.2.11.2.7  2007/11/10 19:32:31  hawk
 - more up/smp cleanups
 - release 2
================================================================

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