SPECS (Titanium): kernel-bare-grsecurity.spec - fixed preempt build

hawk hawk at pld-linux.org
Sat Nov 10 22:08:29 CET 2007


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

---- Files affected:
SPECS:
   kernel-bare-grsecurity.spec (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SPECS/kernel-bare-grsecurity.spec
diff -u SPECS/kernel-bare-grsecurity.spec:1.1.2.2 SPECS/kernel-bare-grsecurity.spec:1.1.2.3
--- SPECS/kernel-bare-grsecurity.spec:1.1.2.2	Sat Nov 10 21:53:19 2007
+++ SPECS/kernel-bare-grsecurity.spec	Sat Nov 10 22:08:24 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
 %bcond_with	pax		# build PaX
 
 %{?debug:%define with_verbose 1}
@@ -444,7 +444,6 @@
 }
 
 PaXconfig () {
-	set -x
 	sed -i "s:# CONFIG_PAX is not set:CONFIG_PAX=y:" .config
 	%ifarch %{ix86}
 		sed -i 's:# CONFIG_PAX_SEGMEXEC is not set:CONFIG_PAX_SEGMEXEC=y:' $1
@@ -469,7 +468,8 @@
 
 	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
@@ -862,6 +862,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.3  2007/11/10 21:08:24  hawk
+- fixed preempt build
+
 Revision 1.1.2.2  2007/11/10 20:53:19  hawk
 - more up/smp cleanup
 - added PaX support
================================================================

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



More information about the pld-cvs-commit mailing list