[Devil-linux-commit] build/scripts grsecurity,1.23,1.24 prepare,1.55,1.56 settings,1.47,1.48

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

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

Modified Files:
	grsecurity prepare settings 
Log Message:
updated grsecurity to current cvs version
added new variable KERNEL_CONFIG_DIR


Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- grsecurity	12 Dec 2004 21:48:08 -0000	1.23
+++ grsecurity	2 Jan 2005 21:49:00 -0000	1.24
@@ -41,7 +41,7 @@
 			touch devil-linux-grsec-kernel-patches.done
 		fi
 		# add configuration to kernel config
-		cat $MYDIR/config/config_grsecurity >> .config
+		cat $KERNEL_CONFIG_DIR/config_grsecurity >> .config
 
 		# start oldconfig, in case there are new options
 		make oldconfig || exit 1

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- prepare	2 Jan 2005 18:00:02 -0000	1.55
+++ prepare	2 Jan 2005 21:49:00 -0000	1.56
@@ -89,11 +89,6 @@
 	    rm -f $KERNELDIR/.config.add
 	fi
 
-	KERNEL_CONFIG_DIR=$DL_DIR/scripts/config
-	if [ ! "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-		KERNEL_CONFIG_DIR=$DL_DIR/scripts/config/linux-$CONFIG_LINUX_VERSION
-	fi
-
 	cp $KERNEL_CONFIG_DIR/config_linux $KERNELDIR/.config || exit 1
 
 	if [ "$CONFIG_HIGHMEM" == "y" ]; then

Index: settings
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/settings,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- settings	18 Dec 2004 16:46:29 -0000	1.47
+++ settings	2 Jan 2005 21:49:00 -0000	1.48
@@ -94,3 +94,8 @@
 # create a unique tmp directory for each script
 # this will make us thread safe
 TMPDIR=$WORKDIR/tmp.$MYSCRIPT.$$
+
+KERNEL_CONFIG_DIR=$DL_DIR/scripts/config
+if [ ! "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+    KERNEL_CONFIG_DIR=$DL_DIR/scripts/config/linux-$CONFIG_LINUX_VERSION
+fi