[Devil-linux-commit] build/scripts build-iso,1.68,1.69 settings,1.46,1.47

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3186/scripts

Modified Files:
	build-iso settings 
Log Message:
get back the pmake for now, it looks like it was more a problem of devfs
also make sure mkisofs doesn't fail, when CONFIG_PMAKE is not defined


Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- build-iso	5 Sep 2004 15:22:36 -0000	1.68
+++ build-iso	18 Dec 2004 16:46:29 -0000	1.69
@@ -31,7 +31,6 @@
 
 case $1 in
 	iso )
-
 		# we need to set aside a few loop devices. I chose (in reverse order of their appearance)
 		# -- loop1 for the boot image
 		# -- loop2 for the ram disk image
@@ -91,7 +90,9 @@
 		if [ "$CONFIG_ZISOFS" = "y" ]; then
 			echo creating compressed ISO filesystem
 			test -d $CDDIR.z && rm -rf $CDDIR.z
-			mkzftree -z 9 -p $CONFIG_PMAKE $CDDIR $CDDIR.z || exit 1
+			PMAKE=""
+			test -n "$CONFIG_PMAKE" && PMAKE="-p $CONFIG_PMAKE"
+			mkzftree -z 9 $PMAKE $CDDIR $CDDIR.z || exit 1
 			MKISOFS_PARAM="$MKISOFS_PARAM -z"
 
 			# now we need to restore the files which shouldn't be compressed

Index: settings
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/settings,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- settings	13 Dec 2004 19:06:31 -0000	1.46
+++ settings	18 Dec 2004 16:46:29 -0000	1.47
@@ -43,7 +43,7 @@
 fi
 
 PMAKE=""
-#test -n "$CONFIG_PMAKE" && PMAKE="-j$CONFIG_PMAKE"
+test -n "$CONFIG_PMAKE" && PMAKE="-j$CONFIG_PMAKE"
 test -n "$CONFIG_PARALLEL_JOBS" || CONFIG_PARALLEL_JOBS=1
 
 CONF_HOST="i$CONFIG_CPU-pc-linux-gnu"