[Devil-linux-commit] build/scripts build.sh,1.79,1.79.2.1 module-init-tools,1.2,1.2.2.1 modutils,1.16,1.16.2.1

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

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

Modified Files:
      Tag: rel-1-2-patches
	build.sh module-init-tools modutils 
Log Message:
- end script execution if prepare fails
- install modutils/module-init-tools after build, we need an up-to-date
  version in the build system


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -d -r1.79 -r1.79.2.1
--- build.sh	11 Apr 2004 00:21:56 -0000	1.79
+++ build.sh	20 Jul 2004 00:43:28 -0000	1.79.2.1
@@ -151,7 +151,7 @@
 	prepare )
 			#before we do anything, we have to make sure kernel includes and that kind of stuff exist
 			echo running prepare
-			./prepare prepare
+			./prepare prepare || exit 1
 
 			if [ ! -e /sbin/insserv ]; then
 				echo "insserv not found"

Index: modutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modutils,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- modutils	16 Jan 2004 01:47:55 -0000	1.16
+++ modutils	20 Jul 2004 00:43:28 -0000	1.16.2.1
@@ -30,6 +30,9 @@
 	# Parallel jobs does not work ($PMAKE)
 	make all || exit 1
 	strip_debug
+	# install it in the system, we need to make sure we use an up-to-date version
+	rm /sbin/{insmod,modprobe,depmod,rmmod}
+	make install
         ;;
 
     install )

Index: module-init-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/module-init-tools,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- module-init-tools	16 Jan 2004 01:47:55 -0000	1.2
+++ module-init-tools	20 Jul 2004 00:43:28 -0000	1.2.2.1
@@ -30,6 +30,7 @@
 		./configure --prefix= --enable-zlib || exit 1
 		make all $PMAKE || exit 1
 		strip_debug
+		# install it in the system, we need to make sure we use an up-to-date version
 		rm /sbin/{insmod,modprobe,depmod,rmmod}
 		make install || exit 1
 		;;