[Devil-linux-commit] build/scripts build.sh,1.57,1.58 nasm,1.8,1.9

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

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

Modified Files:
	build.sh nasm 
Log Message:
some more cleanup
nasm needs to be compiled earlier


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- build.sh	13 Oct 2003 17:36:07 -0000	1.57
+++ build.sh	15 Oct 2003 12:22:25 -0000	1.58
@@ -163,19 +163,6 @@
 			rm -rf $DL_DIR/scripts/.buildorder &> /dev/null
 			mkdir -p $DL_DIR/scripts/.buildorder/rc{S,0,1,2,3,4,5,6}.d
 
-			#for SCRIPT in $(grep -l "# DL-build-system v3" $DL_DIR/scripts/* | grep -v "build\.sh" | grep -v "build-order")
-			#do
-			#	SCRIPT=${SCRIPT##/*/}
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/rc0.d/S01$SCRIPT
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/rc1.d/S01$SCRIPT
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/rc2.d/S01$SCRIPT
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/rc3.d/S01$SCRIPT
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/rc4.d/S01$SCRIPT
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/rc5.d/S01$SCRIPT
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/rc6.d/S01$SCRIPT
-			#	ln -sf ../$SCRIPT $DL_DIR/scripts/.buildorder/$SCRIPT
-			#done
-
 			test -e /etc/insserv.conf && cp -f /etc/insserv.conf /etc/insserv.conf.dlbak || exit 1
 			cp -f $DL_DIR/scripts/config/buildorder.conf /etc/insserv.conf || exit 1
 
@@ -188,8 +175,6 @@
 			#grep -L "# DL-build-system v3" $DL_DIR/scripts/.buildorder/* | grep -v "build\.sh" 2> /dev/null
 
 			test -e /etc/insserv.conf.dlbak && cp -f /etc/insserv.conf.dlbak /etc/insserv.conf || exit 1
-
-			#insserv -d $DL_DIR/scripts/.buildorder || exit 1
 
 			# do some cleanup, we don't need the K* scripts and they're confusing when you look for problems
 			find $DL_DIR/scripts/.buildorder/rc{S,0,1,2,3,4,5,6}.d -name "K*" | xargs rm &> /dev/null

Index: nasm
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nasm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- nasm	13 Oct 2003 17:36:08 -0000	1.8
+++ nasm	15 Oct 2003 12:22:26 -0000	1.9
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       nasm
-# Required-Start: $basebuildtools $libs
+# Required-Start: gcc binutils libtool
 # Required-Stop:
 # Default-Start:  1
 # Default-Stop:
@@ -29,7 +29,7 @@
 	./configure --prefix=/usr || exit 1
         make $PMAKE all || exit 1
         strip_debug
-    	
+
 	# we have to install this immediately, because this is program could be needed by other sources
 	make install || exit 1
 	;;