[Devil-linux-commit] build/scripts busybox, 1.27, 1.28 finalize, 1.7, 1.8 udev, 1.9, 1.10 unzip, 1.6, 1.7 util-linux, 1.37, 1.38 vmmemctl, 1.3, 1.4 vmxnet, 1.3, 1.4 zip, 1.5, 1.6

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

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

Modified Files:
	busybox finalize udev unzip util-linux vmmemctl vmxnet zip 
Log Message:
get the devices in order, so we'll be able to boot (at some point)


Index: busybox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/busybox,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- busybox	7 Feb 2007 16:28:55 -0000	1.27
+++ busybox	1 Apr 2007 20:20:29 -0000	1.28
@@ -43,6 +43,7 @@
 		ln -sf busybox $INITRDDIR/bin/modprobe || exit 1
 		ln -sf busybox $INITRDDIR/bin/sed || exit 1
 		ln -sf busybox $INITRDDIR/bin/basename || exit 1
+		ln -sf busybox $INITRDDIR/bin/mdev || exit 1
 		;;
 
 	* )

Index: unzip
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/unzip,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- unzip	12 Dec 2004 21:48:09 -0000	1.6
+++ unzip	1 Apr 2007 20:20:29 -0000	1.7
@@ -32,8 +32,6 @@
 
 	install )
 		if [ "$CONFIG_UNZIP" = "y" ]; then
-			rm -rf $TMPDIR/usr
-			mkdir -p $TMPDIR/usr || exit 1
 			make -f unix/Makefile install prefix=$CDDIR/usr MANDIR=$CDDIR/usr/share/man || exit 1
 		fi
 		;;

Index: finalize
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/finalize,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- finalize	13 Jan 2004 02:29:49 -0000	1.7
+++ finalize	1 Apr 2007 20:20:29 -0000	1.8
@@ -30,6 +30,7 @@
 		pwconv || exit 1
 		cp /etc/passwd $ETCDIR/etc/ || exit 1
 		cp /etc/group  $ETCDIR/etc/ || exit 1
+		#cp /etc/group  $INITRDDIR/ || exit 1
 		cp /etc/shadow $ETCDIR/etc/ || exit 1
 		cp /etc/gshadow $ETCDIR/etc/ || exit 1
 

Index: zip
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/zip,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- zip	12 Dec 2004 21:48:09 -0000	1.5
+++ zip	1 Apr 2007 20:20:30 -0000	1.6
@@ -32,8 +32,6 @@
 
 	install )
 		if [ "$CONFIG_ZIP" = "y" ]; then
-			rm -rf $TMPDIR
-			mkdir -p $TMPDIR || exit 1
 			make -f unix/Makefile install prefix=$CDDIR/usr MANDIR=$CDDIR/usr/share/man/man1 || exit 1
 		fi
 		;;

Index: udev
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/udev,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- udev	29 Mar 2007 12:24:34 -0000	1.9
+++ udev	1 Apr 2007 20:20:29 -0000	1.10
@@ -28,19 +28,18 @@
     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 LDFLAGS=--static 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
+	#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 USE_LOG=false udevdir=/dev || exit 1
+	#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
@@ -55,24 +54,33 @@
         ;;
 
     install )
+    set -x
+	UDEVCONFDIR=$(find_src_dir udev-config)
+    
 	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
-	    chmod 770 $DIR/etc/udev/scripts/* || exit 1
-	    rm $DIR/etc/udev/rules.d/*
-	    rm $DIR/etc/udev/permissions.d/*
-	    cp -dpvR $(find_src_dir udev-config)/* $DIR/etc/udev/ || exit 1
+	    #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 $(pwd)/DL-static/sbin/udev $INITRDDIR/sbin/ || exit 1
-	ln -sf udev $INITRDDIR/sbin/udevstart || exit 1
-	tar -C $(pwd)/DL-static/ -czf $INITRDDIR/udev-cfg.tar.gz etc
+
+	#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
+	
 	TMPDIR=$(pwd)/DL-dynamic
 	copy_docs $TMPDIR
-	rm -rf $TMPDIR/usr/{man,info} || exit 1
+	rm -rf $TMPDIR/usr/{man,info}
+	rm -rf $TMPDIR/usr/include || exit 1
+	rm -rf $TMPDIR/usr/lib/*.a || exit 1
+	rm -rf $TMPDIR/usr/lib/pkgconfig || exit 1
 	cp -dpvR $TMPDIR/etc/* $ETCDIR/etc || exit 1
-	cp -dpvR $TMPDIR/{sbin,usr} $CDDIR/ || exit 1
+	rm -rf $TMPDIR/etc || exit 1
+	rm -rf $TMPDIR/dev || exit 1
+	cp -dpvR $TMPDIR/* $CDDIR/ || exit 1
 	mkdir -p $DOCDIR/udev || exit 1
 	cp -dpvR etc $DOCDIR/udev/ || exit 1
 	cp -dpvR docs $DOCDIR/udev/ || exit 1

Index: vmxnet
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/vmxnet,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vmxnet	8 Jun 2006 15:37:37 -0000	1.3
+++ vmxnet	1 Apr 2007 20:20:30 -0000	1.4
@@ -36,7 +36,7 @@
 	install )
 		if [ "$CONFIG_VMWARE" = "y" ]; then
 			mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/ || exit 1
-			cp -v vmxnet-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/vmxnet.o || exit 1
+			cp -v vmxnet.ko $CDDIR/lib/modules/$KERNELVERSION/kernel/drivers/net/ || exit 1
 									
 		fi
 		;;

Index: vmmemctl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/vmmemctl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vmmemctl	8 Jun 2006 15:37:36 -0000	1.3
+++ vmmemctl	1 Apr 2007 20:20:30 -0000	1.4
@@ -36,7 +36,7 @@
 	install )
 		if [ "$CONFIG_VMWARE" = "y" ]; then
 			mkdir -p $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1
-			cp -v vmmemctl-$KERNELVERSION $CDDIR/lib/modules/$KERNELVERSION/misc/vmmemctl.o || exit 1
+			cp -v vmmemctl.ko $CDDIR/lib/modules/$KERNELVERSION/misc/ || exit 1
 		fi
 		;;
 

Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- util-linux	21 Mar 2007 01:51:14 -0000	1.37
+++ util-linux	1 Apr 2007 20:20:29 -0000	1.38
@@ -63,13 +63,10 @@
 	mkdir -p $TMPDIR || exit 1
 	make DESTDIR=$TMPDIR install || exit 1
 
-    echo "we need to fix this for the new 2.13 version"
-    exit 1
-
 	copy_docs $TMPDIR
 	rm -rf $TMPDIR/usr/share || exit 1
-	cp -dpR $TMPDIR/etc $ETCDIR/ || exit 1
-	rm -rf $TMPDIR/etc || exit 1
+	#cp -dpR $TMPDIR/etc $ETCDIR/ || exit 1
+	#rm -rf $TMPDIR/etc || exit 1
 	cp -dpR $TMPDIR/* $CDDIR/ || exit 1
 	rm -rf $TMPDIR || exit 1
 	cp $MYDIR/scripts/blankscreen $ETCDIR/etc/init.d || exit 1