[Devil-linux-commit] build/scripts grsecurity,1.16,1.17 prepare,1.42,1.43

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6469/scripts

Modified Files:
	grsecurity prepare 
Log Message:
variable hz patch can now be de-selected


Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- grsecurity	22 Mar 2004 01:34:06 -0000	1.16
+++ grsecurity	23 Mar 2004 00:24:12 -0000	1.17
@@ -32,9 +32,9 @@
 		if [ ! -f devil-linux-grsec-kernel-patches.done ]; then
 			touch devil-linux-grsec-kernel-patches.done
 			bzcat $DL_DIR/src/grsecurity*.patch.bz2 > grsecurity.patch || exit 1
-			sed -e 's/^--- grsecurity.*/--- grsecurity.patch.old/g' -e 's/^+++ grsecurity.*/+++ grsecurity.patch/g' $DL_DIR/src/grsecurity-kernel-vhz1.patch | patch -p0 || exit 1
+			test ! "$CONFIG_VHZ" = "OFF" && bzcat $DL_DIR/src/grsecurity-kernel-vhz1.patch.bz2 |sed -e 's/^--- grsecurity.*/--- grsecurity.patch.old/g' -e 's/^+++ grsecurity.*/+++ grsecurity.patch/g' | patch -p0 || exit 1
 			cat grsecurity.patch | patch -p1 || exit 1
-			cat $DL_DIR/src/grsecurity-kernel-vhz2.patch | patch -p0 || exit 1
+			test ! "$CONFIG_VHZ" = "OFF" && bzcat $DL_DIR/src/grsecurity-kernel-vhz2.patch.bz2 | patch -p0 || exit 1
 		fi
 		# add configuration to kernel config
 		cat $MYDIR/config/config_grsecurity >> .config

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- prepare	22 Mar 2004 01:34:06 -0000	1.42
+++ prepare	23 Mar 2004 00:24:12 -0000	1.43
@@ -86,12 +86,6 @@
 	cp $KERNEL_CONFIG_DIR/config_linux $KERNELDIR/.config || exit 1
 	echo "CONFIG_M$CONFIG_KERNEL_CPU=y" >> $KERNELDIR/.config
 	echo "CONFIG_NR_CPUS=$CONFIG_LINUX_NR_CPUS" >> $KERNELDIR/.config
-	if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-		echo "CONFIG_HZ=$CONFIG_HZ" >> $KERNELDIR/.config
-	fi
-	
-	mv $KERNELDIR/include/net/pkt_sched.h $KERNELDIR/include/net/pkt_sched.h.old
-	sed -e "s/#define PSCHED_CLOCK_SOURCE	PSCHED_JIFFIES/#define PSCHED_CLOCK_SOURCE	$CONFIG_PSCHED_CLOCK_SOURCE/g" $KERNELDIR/include/net/pkt_sched.h.old > $KERNELDIR/include/net/pkt_sched.h
 
 	if [ "$CONFIG_LINUX_SMP" == "y" ]; then
 		cat $KERNEL_CONFIG_DIR/config_linux.smp  >> $KERNELDIR/.config || exit 1
@@ -126,7 +120,7 @@
 		echo applying patch: $PATCH
 		patch -p1 -i $PATCH || exit 1
 	    done
-	fi    
+	fi
 
 	if [ "$CONFIG_PAX" == "y" ]; then
 		if [ ! -f devil-linux-pax-kernel-patches.done ]; then
@@ -143,6 +137,19 @@
 		fi
 	fi
 
+	if [ ! "$CONFIG_VHZ" = "OFF" ] && [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+		if [ ! -f devil-linux-vhz-patch.done ]; then
+			bzcat $DL_DIR/src/vhz-j64*.patch.bz2 | patch -p1 || exit 1
+			touch devil-linux-vhz-patch.done
+		fi
+
+		echo "CONFIG_HZ=$CONFIG_VHZ" >> $KERNELDIR/.config
+
+		mv $KERNELDIR/include/net/pkt_sched.h $KERNELDIR/include/net/pkt_sched.h.old
+		sed -e "s/#define PSCHED_CLOCK_SOURCE	PSCHED_JIFFIES/#define PSCHED_CLOCK_SOURCE	$CONFIG_PSCHED_CLOCK_SOURCE/g" $KERNELDIR/include/net/pkt_sched.h.old > $KERNELDIR/include/net/pkt_sched.h
+
+	fi
+
 	make oldconfig || exit 1
 	if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
 		make dep || exit 1