[Devil-linux-commit] build/scripts busybox, 1.28, 1.29 insserv, 1.14, 1.15 udev, 1.10, 1.11

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

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

Modified Files:
	busybox insserv udev 
Log Message:
added missing groups
added mdev and udev for device creation
fixed boot process
we can boot now !!!


Index: busybox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/busybox,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- busybox	1 Apr 2007 20:20:29 -0000	1.28
+++ busybox	3 Apr 2007 12:01:32 -0000	1.29
@@ -44,6 +44,8 @@
 		ln -sf busybox $INITRDDIR/bin/sed || exit 1
 		ln -sf busybox $INITRDDIR/bin/basename || exit 1
 		ln -sf busybox $INITRDDIR/bin/mdev || exit 1
+		ln -sf busybox $INITRDDIR/bin/chroot || exit 1
+		ln -sf busybox $INITRDDIR/bin/pivot_root || exit 1
 		;;
 
 	* )

Index: udev
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/udev,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- udev	1 Apr 2007 20:20:29 -0000	1.10
+++ udev	3 Apr 2007 12:01:32 -0000	1.11
@@ -24,54 +24,30 @@
 source $MYDIR/settings
 
 
+EXTRA_FLAGS="extras/ata_id extras/cdrom_id extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator  extras/scsi_id extras/usb_id extras/volume_id"
+	    
+set -x
+
 case $1 in
     build )
-	ln -sf $KERNELDIR/include/linux klibc || exit 1
-	# lets first build the static version we need for the initrd
-	#make clean || exit 1
-	#make $PMAKE all udevdir=/dev USE_STATIC=true EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-	#    extras/firmware extras/floppy extras/path_id extras/rule_generator \
-	#    extras/scsi_id extras/usb_id extras/volume_id"|| exit 1
-	#strip_debug
-	#TMPDIR=$(pwd)/DL-static
-	#rm -rf $TMPDIR || exit 1
-	#mkdir -p $TMPDIR || exit 1
-	#make install DESTDIR=$TMPDIR udevdir=/dev || exit 1
-
-	# now create the dynamic version for the final OS
-	#make clean || exit 1
-	make $PMAKE all EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-	    extras/firmware extras/floppy extras/path_id extras/rule_generator \
-	    extras/scsi_id extras/usb_id extras/volume_id" || exit 1
+    
+	#ln -sf $KERNELDIR/include/linux klibc || exit 1
+	make $PMAKE all EXTRAS="$EXTRA_FLAGS" || exit 1
 	strip_debug
-	TMPDIR=$(pwd)/DL-dynamic
-	rm -rf $TMPDIR || exit 1
-	mkdir -p $TMPDIR || exit 1
-	make install DESTDIR=$TMPDIR udevdir=/dev EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-	    extras/firmware extras/floppy extras/path_id extras/rule_generator \
-	    extras/scsi_id extras/usb_id extras/volume_id"|| exit 1
 
         ;;
 
     install )
-    set -x
-	UDEVCONFDIR=$(find_src_dir udev-config)
+	rm -rf $TMPDIR || exit 1
+	mkdir -p $TMPDIR || exit 1
+
+	make install DESTDIR=$TMPDIR udevdir=/dev EXTRAS="$EXTRA_FLAGS" || exit 1
     
-	for DIR in  DL-dynamic #DL-static
-	do
-	    #mkdir -p $DIR/etc/udev/scripts || exit 1
-	    #cp -dpv extras/*.sh $DIR/etc/udev/scripts/ || exit 1
-	    #cp -dpv extras/*.conf $DIR/etc/udev/ || exit 1
-	    cp -dpv etc/udev/rules.d/[0-9]* $DIR/etc/udev/rules.d/ || exit 1
-	    #chmod 770 $DIR/etc/udev/scripts/* || exit 1
-	    #cp -dpvR $(find_src_dir udev-config)/* $DIR/etc/udev/ || exit 1
-	    make install -C $UDEVCONFDIR DESTDIR=$(pwd)/$DIR || exit 1
-	done
+	cp -dpv etc/udev/rules.d/[0-9]* $TMPDIR/etc/udev/rules.d/ || exit 1
 
-	#cp -dpv $(pwd)/DL-static/sbin/{udevd,udevtrigger,udevsettle} $INITRDDIR/sbin/ || exit 1
-	#tar -C $(pwd)/DL-dynamic/ -czf $INITRDDIR/udev-cfg.tar.gz etc
+	UDEVCONFDIR=$(find_src_dir udev-config)
+	make install -C $UDEVCONFDIR DESTDIR=$TMPDIR || exit 1
 	
-	TMPDIR=$(pwd)/DL-dynamic
 	copy_docs $TMPDIR
 	rm -rf $TMPDIR/usr/{man,info}
 	rm -rf $TMPDIR/usr/include || exit 1
@@ -84,6 +60,8 @@
 	mkdir -p $DOCDIR/udev || exit 1
 	cp -dpvR etc $DOCDIR/udev/ || exit 1
 	cp -dpvR docs $DOCDIR/udev/ || exit 1
+
+	rm -rf $TMPDIR || exit 1
         ;;
 
     * )

Index: insserv
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/insserv,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- insserv	20 Mar 2007 02:41:45 -0000	1.14
+++ insserv	3 Apr 2007 12:01:32 -0000	1.15
@@ -27,7 +27,7 @@
 	build )
 		if [ ! -f .patch.done ]; then
 			bzcat $DL_DIR/src/insserv-core.diff.bz2 | patch -p1 || exit 1
-			#bzcat $DL_DIR/src/insserv-boot.diff.bz2 | patch -p1 || exit 1
+			bzcat $DL_DIR/src/insserv-boot.diff.bz2 | patch -p1 || exit 1
 			#bzcat $DL_DIR/src/insserv-local.diff.bz2 | patch -p1 || exit 1
 			touch .patch.done
 		fi