[Devil-linux-commit] build/scripts build-iso,1.46,1.47 create_cd_dirs,1.23,1.24 syslinux,1.13,1.14

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

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

Modified Files:
	build-iso create_cd_dirs syslinux 
Log Message:
- install-usb now uses fat file system and the plain bootcd.iso file
- ISO can now be in ZISOFS format (optional)
- compile our own static syslinux-nomtools


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- build-iso	7 Nov 2003 22:57:58 -0000	1.46
+++ build-iso	8 Nov 2003 04:04:51 -0000	1.47
@@ -79,7 +79,7 @@
 			MKISOFS_PARAM="$MKISOFS_PARAM -z"
 
 			# now we need to restore the files which shouldn't be compressed
-			cp -fdp $CDDIR/* $CDDIR.z/
+			cp -fdp $CDDIR/* $CDDIR.z/ &> /dev/null
 			cp -fdpR $CDDIR/boot $CDDIR.z/ || exit 1
 			cp -fdpR $CDDIR/doc $CDDIR.z/ || exit 1
 			CDDIR="$CDDIR.z"

Index: create_cd_dirs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- create_cd_dirs	3 Nov 2003 19:35:41 -0000	1.23
+++ create_cd_dirs	8 Nov 2003 04:04:51 -0000	1.24
@@ -43,7 +43,7 @@
 			mkdir -p $CDDIR/usr/share/man/man{1,2,3,4,5,6,7,8,9}
 
 			# the initrd tree
-			DIRS='cdrom dev floppy lib proc sbin tmp shm'
+			DIRS='cdrom dev floppy lib proc sbin tmp shm mnt'
 			mk_dir $INITRDDIR $DIRS
 
 			# create links

Index: syslinux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- syslinux	4 Nov 2003 13:47:11 -0000	1.13
+++ syslinux	8 Nov 2003 04:04:51 -0000	1.14
@@ -26,12 +26,11 @@
 
 case $1 in
 	build )
-		# nothing to do here, the stuff is pre-compiled and we don't get it working since 2.0.5 anyway
-		exit 0
+		TARGETS="syslinux-nomtools"
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
-			make $PMAKE CC="gcc -fno-stack-protector" all || exit 1
+			make $PMAKE CC="gcc -fno-stack-protector" LDFLAGS="-O2 -s -static" $TARGETS || exit 1
 		else
-			make $PMAKE all || exit 1
+			make $PMAKE LDFLAGS="-O2 -s -static" $TARGETS || exit 1
 		fi
 		strip_debug
 		#instal it, we need it later
@@ -40,7 +39,14 @@
 
 	install )
 		cp isolinux.bin $CDDIR/boot || exit 1
-		cp -dp ppmtolss16 /usr/bin || exit 1
+		#cp -dp ppmtolss16 /usr/bin || exit 1
+
+		# now copy the stuff we need for installing DL on a USB pendrive
+		mkdir -p $CDDIR/boot/syslinux || exit 1
+		cp ldlinux.bss $CDDIR/boot/syslinux || exi t1
+		cp ldlinux.sys $CDDIR/boot/syslinux || exi t1
+		cp mbr.bin $CDDIR/boot/syslinux || exi t1
+		cp syslinux-nomtools $CDDIR/boot/syslinux || exi t1
 		;;
 
 	* )