Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13992/scripts
Modified Files:
grsecurity menuconfig prepare
Log Message:
variable HZ patch by Jaroslav Kysela
Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- grsecurity 17 Jan 2004 13:42:11 -0000 1.15
+++ grsecurity 22 Mar 2004 01:34:06 -0000 1.16
@@ -31,7 +31,10 @@
cd $KERNELDIR
if [ ! -f devil-linux-grsec-kernel-patches.done ]; then
touch devil-linux-grsec-kernel-patches.done
- bzcat $DL_DIR/src/grsecurity*.patch.bz2 | patch -p1 || exit 1
+ 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
+ cat grsecurity.patch | patch -p1 || exit 1
+ cat $DL_DIR/src/grsecurity-kernel-vhz2.patch | patch -p0 || exit 1
fi
# add configuration to kernel config
cat $MYDIR/config/config_grsecurity >> .config
Index: menuconfig
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/menuconfig,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- menuconfig 11 Jan 2004 15:17:02 -0000 1.30
+++ menuconfig 22 Mar 2004 01:34:06 -0000 1.31
@@ -53,7 +53,7 @@
echo " source $BUILD_CONFIG-tmp" >> $WORKDIR/.configure
echo "fi" >> $WORKDIR/.configure
-for FILE in $(ls -d $MYDIR/configuration/*)
+for FILE in $(ls -d $MYDIR/configuration/*.config)
do
if [ -f "$FILE" ]; then
echo "#$FILE" >> $WORKDIR/.configure
@@ -64,7 +64,7 @@
chmod +x $WORKDIR/.configure
echo > $WORKDIR/.configure.help
-for FILE in $(ls -d $MYDIR/configuration/help/*)
+for FILE in $(ls -d $MYDIR/configuration/help/*.help)
do
if [ -f "$FILE" ]; then
grep -v "^#" $FILE >> $WORKDIR/.configure.help
Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- prepare 24 Jan 2004 18:55:51 -0000 1.41
+++ prepare 22 Mar 2004 01:34:06 -0000 1.42
@@ -86,6 +86,12 @@
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
|
