slitaz-modular rev 60
Add some basic debug messages it to slitaz-modular script. Add if statements to remove INITRAMFS folder if CLEAN_INITRAMFS is used. And check if INITRAMFS folder exist before running initramfs function.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Mon Apr 11 12:32:30 2011 +0000 (2011-04-11) |
parents | 6e38c4247491 |
children | ce6ee9d73775 |
files | initramfs/usr/bin/slitaz-modular |
line diff
1.1 --- a/initramfs/usr/bin/slitaz-modular Sun Apr 10 21:56:58 2011 +0000 1.2 +++ b/initramfs/usr/bin/slitaz-modular Mon Apr 11 12:32:30 2011 +0000 1.3 @@ -110,12 +110,6 @@ 1.4 exit 1 1.5 fi 1.6 1.7 - if [ "$CLEAN_INITRAMFS" = "yes" ]; then 1.8 - if [ -d ${INITRAMFS} ]; then 1.9 - rm -Rf ${INITRAMFS} 1.10 - fi 1.11 - fi 1.12 - 1.13 if [ ! -d ${INITRAMFS} ]; then 1.14 mkdir -p $INITRAMFS 1.15 fi 1.16 @@ -263,16 +257,22 @@ 1.17 [ -f $ISODIR/packages-order.txt ] && rm -f $ISODIR/packages-order.txt 1.18 touch $ISODIR/packages-order.txt 1.19 1.20 - initramfs 1.21 + if [ "$CLEAN_INITRAMFS" = "yes" ]; then 1.22 + if [ -d ${INITRAMFS} ]; then 1.23 + rm -Rf ${INITRAMFS} 1.24 + fi 1.25 + fi 1.26 + 1.27 + if [ ! -d $INITRAMFS ]; then 1.28 + initramfs 1.29 + fi 1.30 1.31 if [ ! -d $SLITAZ_DIR/repos/wok ]; then 1.32 hg clone $HG_URL/wok $SLITAZ/repos/wok 1.33 fi 1.34 1.35 - if [ ! -f $INCOMING_REPOSITORY/wok-depends.txt ]; then 1.36 - [ -d $INCOMING_REPOSITORY ] || mkdir -p $INCOMING_REPOSITORY 1.37 - tazwok gen-wok-db --WOK=$SLITAZ_DIR/repos/wok 1.38 - fi 1.39 + [ -d $INCOMING_REPOSITORY ] || mkdir -p $INCOMING_REPOSITORY 1.40 + tazwok gen-wok-db --WOK=$SLITAZ_DIR/repos/wok 1.41 1.42 for i in $(cat $PROFILE/packages.list); do 1.43 look_for_dep $i > /tmp/deps 1.44 @@ -281,6 +281,7 @@ 1.45 if [ ! $(grep "^$d$" $ISODIR/packages-order.txt) ]; then 1.46 [ -d $MODULES_DIR/$d ] || mkdir -p $MODULES_DIR/$d 1.47 [ -f $MODULES_DIR/$d/receipt ] && continue 1.48 + info "Make module of depend package $i" 1.49 echo "$d" >> $ISODIR/packages-order.txt 1.50 cd $MODULES_DIR/$d 1.51 mktaz2xz $d $ISODIR/$CDNAME/base 1.52 @@ -289,9 +290,10 @@ 1.53 done 1.54 fi 1.55 if [ ! $(grep "^$i$" $ISODIR/packages-order.txt) ]; then 1.56 - echo "$i" >> $ISODIR/packages-order.txt 1.57 [ -d $MODULES_DIR/$i ] || mkdir -p $MODULES_DIR/$i 1.58 [ -f $MODULES_DIR/$i/receipt ] && continue 1.59 + echo "$i" >> $ISODIR/packages-order.txt 1.60 + info "Make module of main package $i" 1.61 cd $MODULES_DIR/$i 1.62 mktaz2xz $i $ISODIR/$CDNAME/base 1.63 cd $PROFILE