Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16332/scripts
Modified Files:
apcupsd build-iso prepare
Log Message:
- enhanced DL_config parsing in linuxrc (Heiko / Roland Pabel)
- fixed apcupsd compilation (Heiko / Roland Pabel)
- updated pax to v20040501
- updated kernel to v2.6.5 for development version (Heiko + Oliver Jehle)
- updated ipsec-tools to v0.3.1
Index: apcupsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/apcupsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- apcupsd 3 May 2004 15:33:36 -0000 1.5
+++ apcupsd 4 May 2004 01:04:57 -0000 1.6
@@ -47,7 +47,7 @@
--with-upstype=usb \
--with-upscable=usb \
$CONFIG_OPTIONS || exit 1
- make $PMAKE all || exit 1
+ make all || exit 1
strip_debug
fi
;;
Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- build-iso 9 Apr 2004 00:47:36 -0000 1.64
+++ build-iso 4 May 2004 01:04:57 -0000 1.65
@@ -314,6 +314,7 @@
echo -n -e "\0170f You can add your own options by appending them on the command line.\r\n" >> $CDDIR/boot/f2.txt
echo -n -e "\01704 Don't override any of the above options unless you know what you are doing!\r\n\r\n" >> $CDDIR/boot/f2.txt
echo -n -e "\0170f For booting into Single-User mode append \"S\", e.g. \"$BOOT_OPTION_DEFAULT S\".\r\n\r\n" >> $CDDIR/boot/f2.txt
+ echo -n -e "\0170f Remember that a runlevel must always be passed as the last argument.\r\n\r\n" >> $CDDIR/boot/f2.txt
# Configuration Options - F3
echo -n -e "\030/boot/logo.lss\n\r\n" > $CDDIR/boot/f3.txt
@@ -321,10 +322,12 @@
echo -n -e "\0170f Devil-Linux will search for a configuration archive called etc.tar.bz2 on\r\n" >> $CDDIR/boot/f3.txt
echo -n -e "\0170f any IDE/SCSI/Floopy device accessible.\r\n" >> $CDDIR/boot/f3.txt
echo -n -e "\0170f You can override this behavious by specifying this parameter:\r\n\r\n" >> $CDDIR/boot/f3.txt
- echo -n -e "\01704 config=<device>:<filename>, i.e. config=/dev/floopy/0:backup.tar.bz2\r\n\r\n" >> $CDDIR/boot/f3.txt
+ echo -n -e "\01704 DL_config=<device1>:<filename1>,<device2>:<filename2>:,...\r\n" >> $CDDIR/boot/f3.txt
+ echo -n -e "\01704 i.e. DL_config=/dev/floopy/0:backup.tar.bz2\r\n\r\n" >> $CDDIR/boot/f3.txt
echo -n -e "\0170f You can omit either \01704device\0170f or \01704filename\0170f thus giving priority to a device or\r\n" >> $CDDIR/boot/f3.txt
echo -n -e "\0170f a special file. Devil-Linux will try to make use of your desired config\r\n" >> $CDDIR/boot/f3.txt
- echo -n -e "\0170f first, but if it can't find your file, it will load the first one available.\r\n\r\n" >> $CDDIR/boot/f3.txt
+ echo -n -e "\0170f first, but if it can't find your file, it will load the first one available.\r\n" >> $CDDIR/boot/f3.txt
+ echo -n -e "\0170f You can also disable automatic scanning by passing \01704DL_config_no_scan\0170f.\r\n\r\n" >> $CDDIR/boot/f3.txt
# convert the logo into the syslinux format
ppmtolss16 < $DL_DIR/other/devil-linux.pnm >$CDDIR/boot/logo.lss || exit 1
Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- prepare 23 Mar 2004 21:41:31 -0000 1.45
+++ prepare 4 May 2004 01:04:57 -0000 1.46
@@ -137,9 +137,10 @@
fi
fi
- mv $KERNELDIR/include/net/pkt_sched.h $KERNELDIR/include/net/pkt_sched.h.old || exit 1
- 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 || exit 1
-
+ if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+ mv $KERNELDIR/include/net/pkt_sched.h $KERNELDIR/include/net/pkt_sched.h.old || exit 1
+ 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 || exit 1
+ 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
|
