Menu
▾
▴
[Devil-linux-commit] build/scripts aufs, NONE, 1.1 build-iso, 1.76, 1.77 build.sh, 1.101, 1.102 prepare, 1.74, 1.75
|
From: Bruce S. <bl...@us...> - 2008-04-16 13:19:21
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv16884/scripts Modified Files: build-iso build.sh prepare Added Files: aufs Log Message: /etc is now "aufs"! --- NEW FILE: aufs --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/aufs,v $ # $Revision: 1.1 $ # $Date: 2008/04/16 13:19:15 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: aufs # Required-Start: $basebuildtools $libs linux # 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 ) make -f local.mk || exit 1 ;; install ) mkdir -p $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1 cp -v fs/aufs/aufs.ko $CDDIR/lib/modules/$KERNELVERSION/kernel/fs/aufs/ || exit 1 cp -v util/aufind.sh util/aulchown util/auplink util/mount.aufs util/umount.aufs $CDDIR/sbin/ || exit 1 cp -v util/aufs.5 $CDDIR/usr/share/man/man5/ || exit 1 ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- build.sh 26 Mar 2008 09:10:32 -0000 1.101 +++ build.sh 16 Apr 2008 13:19:15 -0000 1.102 @@ -180,11 +180,11 @@ cp $DL_DIR/scripts/scripts/custom-cd $DISTDIR || exit 1 cp $DL_DIR/scripts/scripts/install-on-usb $DISTDIR || exit 1 cp $WORKDIR/bootcd.iso $DISTDIR || exit 1 - if [ "$CONFIG_ZISOFS" = "y" ]; then - cp $CDDIR.z/config/etc.tar.bz2 $DISTDIR || exit 1 - else - cp $CDDIR/config/etc.tar.bz2 $DISTDIR || exit 1 - fi + #if [ "$CONFIG_ZISOFS" = "y" ]; then + # cp $CDDIR.z/config/etc.tar.bz2 $DISTDIR || exit 1 + #else + # cp $CDDIR/config/etc.tar.bz2 $DISTDIR || exit 1 + #fi cd $DISTDIR/.. || exit 1 mkdir -p $DISTDIR/docs cp -dpR $CDDOCDIR/* $DISTDIR/docs || exit 1 Index: build-iso =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- build-iso 9 Nov 2007 13:35:48 -0000 1.76 +++ build-iso 16 Apr 2008 13:19:15 -0000 1.77 @@ -56,7 +56,7 @@ pushd $WORKDIR > /dev/null - mkdir -p $CDDIR/config/etc_files || exit 1 + #mkdir -p $CDDIR/config/etc_files || exit 1 chmod 700 $CDDIR/config || exit 1 chown 0.0 $CDDIR/config || exit 1 @@ -107,18 +107,18 @@ #=========================================================================== - echo -n "creating etc.tar.bz2..." - (cd $WORKDIR/ETC; tar -cjf $CDDIR/config/etc.tar.bz2 etc) + #echo -n "creating etc.tar.bz2..." + #(cd $WORKDIR/ETC; tar -cjf $CDDIR/config/etc.tar.bz2 etc) - echo "done" - echo + #echo "done" + #echo #=========================================================================== echo -n "creating static etc files..." - pushd $ETCDIR/etc > /dev/null - cp -fp Devil-release issue issue.net $CDDIR/config/etc_files/ - popd > /dev/null + #pushd $ETCDIR/etc > /dev/null + #cp -fp Devil-release issue issue.net $CDDIR/config/etc_files/ + #popd > /dev/null mkdir -p $CDDIR/config/scripts cp -fp $DL_DIR/scripts/scripts/custom-cd $CDDIR/config/scripts/ @@ -127,6 +127,23 @@ #=========================================================================== + echo -n "creating etc directory on cd tree..." + rm -fr $CDDIR/etc-temp $CDDIR/etc-cd $CDDIR/etc-temp + rm -f $CDDIR/config/etc-mods.tar.bz2 + mkdir $CDDIR/etc-temp + cp -a $WORKDIR/ETC/etc $CDDIR/etc-temp + pushd $CDDIR/etc-temp > /dev/null + mv etc etc-mods + tar -cjpf $CDDIR/config/etc-mods.tar.bz2 etc-mods/{Devil-release,issue,issue.net,sysconfig/config} + mv etc-mods $CDDIR/etc-cd + rmdir $CDDIR/etc-temp + popd > /dev/null + + echo "done" + echo + + #=========================================================================== + if [ "$CONFIG_INITRD_FS" = "CRAMFS" ]; then echo "creating the initial ramdisk (initrd) image.... " @@ -327,7 +344,7 @@ # Configuration Options - F3 echo -n -e "\030/boot/logo.lss\n\r\n" > $CDDIR/boot/f3.txt echo -n -e "\01702Devil-Linux Configuration Options\r\n\r\n" >> $CDDIR/boot/f3.txt - echo -n -e "\0170f Devil-Linux will search for a configuration archive called etc.tar.bz2 on\r\n" >> $CDDIR/boot/f3.txt + echo -n -e "\0170f Devil-Linux will search for a configuration archive called etc-mods.tar.bz2 on\r\n" >> $CDDIR/boot/f3.txt echo -n -e "\0170f any IDE/SCSI/Floopy device accessible.\r\n" >> $CDDIR/boot/f3.txt echo -n -e "\0170f You can override this behavious by specifying this parameter:\r\n\r\n" >> $CDDIR/boot/f3.txt echo -n -e "\01704 DL_config=<device1>:<filename1>,<device2>:<filename2>:,...\r\n" >> $CDDIR/boot/f3.txt Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- prepare 1 Apr 2008 10:19:58 -0000 1.74 +++ prepare 16 Apr 2008 13:19:15 -0000 1.75 @@ -93,18 +93,18 @@ echo "# CONFIG_MAGIC_SYSRQ is not set" >> $KERNELDIR/.config || exit 1 fi - if [ "$CONFIG_UNIONFS" == "y" ]; then +# if [ "$CONFIG_UNIONFS" == "y" ]; then cat $KERNEL_CONFIG_DIR/config_linux.unionfs >> $KERNELDIR/.config || exit 1 - fi +# fi pushd $KERNELDIR > /dev/null - if [ "$CONFIG_UNIONFS" == "y" ]; then +# if [ "$CONFIG_UNIONFS" == "y" ]; then if [ ! -f devil-linux-unionfs-kernel-patches.done ]; then touch devil-linux-unionfs-kernel-patches.done zcat $SRCDIR/unionfs-*_for_2.6.*.diff.gz | patch -p1 || exit 1 fi - fi +# fi if [ ! -f devil-linux-kernel-patches.done ]; then touch devil-linux-kernel-patches.done |
