[Devil-linux-commit] build/scripts udev,NONE,1.1 build-iso,1.69,1.70 busybox,1.22,1.23 devfsd,1.5,NONE

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

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

Modified Files:
	build-iso busybox 
Added Files:
	udev 
Removed Files:
	devfsd 
Log Message:
more changes to get udev working
removed devfsd and support for its device names


Index: busybox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/busybox,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- busybox	11 Jan 2004 14:43:04 -0000	1.22
+++ busybox	20 Dec 2004 02:28:14 -0000	1.23
@@ -36,6 +36,7 @@
 	install )
 		cp busybox $INITRDDIR/bin || exit 1
 
+		ln -sf busybox $INITRDDIR/bin/cat || exit 1
 		ln -sf busybox $INITRDDIR/bin/sh || exit 1
 		ln -sf busybox $INITRDDIR/bin/modprobe || exit 1
 		ln -sf busybox $INITRDDIR/bin/sed || exit 1

--- devfsd DELETED ---

Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- build-iso	18 Dec 2004 16:46:29 -0000	1.69
+++ build-iso	20 Dec 2004 02:28:14 -0000	1.70
@@ -273,10 +273,10 @@
 		    BOOT_OPTION_RAMDISK="ramdisk_blocksize=4096"
 		fi
 		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
-		    BOOT_OPTION_RAMDISK="ro ramdisk_size=$ISIZE"
+		    BOOT_OPTION_RAMDISK="rw ramdisk_size=$ISIZE"
 		fi
 
-		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [ro ramdisk=$ISIZE][ramdisk_blocksize=4096]
+		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [rw ramdisk=$ISIZE][ramdisk_blocksize=4096]
 		BOOT_OPTIONS_DL="root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK"
 		cat  > $CDDIR/isolinux.cfg  <<-EOF
 		default $BOOT_OPTION_DEFAULT

--- NEW FILE: udev ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/udev,v $
# $Revision: 1.1 $
# $Date: 2004/12/20 02:28:14 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       udev
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings


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 USE_LOG=false udevdir=/dev LDFLAGS=--static || 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 udevdir=/dev || exit 1
	strip_debug
	TMPDIR=$(pwd)/DL-dynamic
	rm -rf $TMPDIR || exit 1
	mkdir -p $TMPDIR || exit 1
	make install DESTDIR=$TMPDIR udevdir=/dev || exit 1

        ;;

    install )
	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 -dpv etc/udev/gentoo/*.rules $DIR/etc/udev/rules.d/ || exit 1
	    cp -dpv etc/udev/gentoo/*.permissions $DIR/etc/udev/permissions.d/ || 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
	TMPDIR=$(pwd)/DL-dynamic
	copy_docs $TMPDIR
	rm -rf $TMPDIR/usr/{man,info} || exit 1
	cp -dpvR $TMPDIR/etc/* $ETCDIR/etc || exit 1
	cp -dpvR $TMPDIR/{sbin,usr} $CDDIR/ || exit 1
	#cp dnsmasq.conf.example $ETCDIR/etc/ || exit 1
	#cp $MYDIR/scripts/dnsmasq $ETCDIR/etc/init.d/ || exit 1
        ;;

    * )
        echo "ERROR ($0)"
        echo "please add parameter so I know what to do"
        exit 1
        ;;
esac