From: Heiko Z. <smi...@us...> - 2007-12-19 16:42:05
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv11986/scripts Modified Files: grsecurity settings Log Message: - code cleanup - kernel release string was not correctly evaluated Index: grsecurity =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- grsecurity 16 Nov 2007 15:13:28 -0000 1.33 +++ grsecurity 19 Dec 2007 16:41:55 -0000 1.34 @@ -30,8 +30,7 @@ if [ "$CONFIG_GRSECURITY" = "y" ] ; then cd $KERNELDIR if [ ! -f devil-linux-grsec-kernel-patches.done ]; then - bzcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.bz2 | sed -e 's/EXTRAVERSION = -as2/EXTRAVERSION = -as3/' -e 's/NAME=Woozy Numbat + fixes/NAME=Rocket/' | patch -p1 - bzcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.bz2 | patch -p1 + bzcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.bz2 | patch -p1 || exit 1 touch devil-linux-grsec-kernel-patches.done fi # add configuration to kernel config Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- settings 1 May 2007 00:30:31 -0000 1.54 +++ settings 19 Dec 2007 16:41:55 -0000 1.55 @@ -49,7 +49,7 @@ CONF_HOST="i$CONFIG_CPU-pc-linux-gnu" KERNELDIR=$(find_src_dir linux-$CONFIG_LINUX_VERSION) -KERNELVERSION=$(make -s -C $KERNELDIR kernelversion 2> /dev/null | grep -vi "directory") +KERNELVERSION=$(make -s -C $KERNELDIR kernelrelease 2> /dev/null | grep -vi "directory") SRCDIR=$DL_DIR/src SRCEXTRADIR=$DL_DIR/src-extra |