Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31889/scripts
Modified Files:
build-iso freeramdisk prepare util-linux
Log Message:
- use old kernel include files freeramdisk (compile fails otherwise with
kernel 2.6.6)
- removed cramfs, we use the mkfs.cramfs from util-linux now
- set kernel 2.6 as default
- enabled PAX per default
- disabled grsecurity, until we know what's going on with the project
- updated config for kernel 2.6.6
Index: freeramdisk
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/freeramdisk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- freeramdisk 11 Jan 2004 14:43:04 -0000 1.7
+++ freeramdisk 7 Jun 2004 03:11:35 -0000 1.8
@@ -25,6 +25,7 @@
case $1 in
build )
+ test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
make $PMAKE freeramdisk || exit 1
strip_debug
;;
Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- util-linux 27 Apr 2004 01:14:53 -0000 1.22
+++ util-linux 7 Jun 2004 03:11:35 -0000 1.23
@@ -42,6 +42,8 @@
else
make $PMAKE HAVE_SLN=yes ADD_RAW=yes DISABLE_NLS=yes || exit 1
fi
+ # we need some of the tools later, so let's install it
+ make HAVE_SLN=yes ADD_RAW=yes DISABLE_NLS=yes install ||
strip_debug
;;
Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- build-iso 4 May 2004 01:04:57 -0000 1.65
+++ build-iso 7 Jun 2004 03:11:35 -0000 1.66
@@ -132,7 +132,7 @@
# store version
echo $DLVERSION > $INITRDDIR/VERSION
cp -p $ETCDIR/etc/initrd/linuxrc $INITRDDIR
- mkcramfs $INITRDDIR/ $BOOTIMAGEDIR/initrd
+ mkfs.cramfs $INITRDDIR/ $BOOTIMAGEDIR/initrd
gzip -f -9 $BOOTIMAGEDIR/initrd
echo "done"
Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- prepare 4 May 2004 01:04:57 -0000 1.46
+++ prepare 7 Jun 2004 03:11:35 -0000 1.47
@@ -126,8 +126,8 @@
if [ ! -f devil-linux-pax-kernel-patches.done ]; then
touch devil-linux-pax-kernel-patches.done
bzcat $DL_DIR/src/pax-linux-${CONFIG_LINUX_VERSION}*patch.bz2 | patch -p1 || exit 1
- cat $KERNEL_CONFIG_DIR/config_pax >> $KERNELDIR/.config || exit 1
fi
+ cat $KERNEL_CONFIG_DIR/config_pax >> $KERNELDIR/.config || exit 1
else
if [ "$CONFIG_EXEC_SHIELD" == "y" ]; then
if [ ! -f devil-linux-exec-shield-kernel-patches.done ]; then
|
