[Devil-linux-commit] build/scripts gcc,1.17,1.18 prepare,1.34,1.35

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv29612/scripts

Modified Files:
	gcc prepare 
Log Message:
- added pax for kernel 2.6
- updated kbd to v1.11


Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gcc	14 Jan 2004 21:31:36 -0000	1.17
+++ gcc	15 Jan 2004 01:52:21 -0000	1.18
@@ -35,13 +35,13 @@
 			patch -p1 -i $WORKDIR/protectonly.dif || exit 1
 			cd ..
 			touch ./.done_patch_protector
-		
+
 			if [ ! -f devil-linux-kernel-protector-patche.done ]; then
 			    touch devil-linux-kernel-protector-patche.done
 			    if [ "$KERNELVERSION" = "2.4" ]; then
 	    		    	bzcat $DL_DIR/src/linux-2.4.23-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
 			    else
-	    		    	bzcat $DL_DIR/src/linux-2.6.0-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
+	    		    	bzcat $DL_DIR/src/linux-2.6.1-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
 			    fi
 			fi
 

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- prepare	13 Jan 2004 14:28:13 -0000	1.34
+++ prepare	15 Jan 2004 01:52:21 -0000	1.35
@@ -119,13 +119,12 @@
 
 	pushd $KERNELDIR > /dev/null
 
-	if [ ! -f devil-linux-kernel-patches.done ]; then
-		touch devil-linux-kernel-patches.done
-		for PATCH in $(ls $WORKDIR/kernel-patches-$CONFIG_LINUX_VERSION/* 2> /dev/null )
-		do
-			echo applying patch: $PATCH
-			patch -p1 -i $PATCH || exit 1
-		done
+	if [ "$CONFIG_PAX" == "y" ]; then
+		if [ ! -f devil-linux-pax-kernel-patches.done ]; then
+			touch devil-linux-pax-kernel-patches.done
+			bzcat $DL_DIR/src/pax-linux-*patch.bz2 | patch -p1 || exit 1
+			cat $KERNEL_CONFIG_DIR/config_pax >> $KERNELDIR/.config || exit 1
+		fi
 	fi
 
 	make oldconfig || exit 1