# HG changeset patch # User Christopher Rogers # Date 1302525150 0 # Node ID 3baad9f857a2df6ae70d4663b786235f9a277345 # Parent 6e38c4247491cb145ad38424eeb129fdd2da7a2b 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. diff -r 6e38c4247491 -r 3baad9f857a2 initramfs/usr/bin/slitaz-modular --- a/initramfs/usr/bin/slitaz-modular Sun Apr 10 21:56:58 2011 +0000 +++ b/initramfs/usr/bin/slitaz-modular Mon Apr 11 12:32:30 2011 +0000 @@ -110,12 +110,6 @@ exit 1 fi - if [ "$CLEAN_INITRAMFS" = "yes" ]; then - if [ -d ${INITRAMFS} ]; then - rm -Rf ${INITRAMFS} - fi - fi - if [ ! -d ${INITRAMFS} ]; then mkdir -p $INITRAMFS fi @@ -263,16 +257,22 @@ [ -f $ISODIR/packages-order.txt ] && rm -f $ISODIR/packages-order.txt touch $ISODIR/packages-order.txt - initramfs + if [ "$CLEAN_INITRAMFS" = "yes" ]; then + if [ -d ${INITRAMFS} ]; then + rm -Rf ${INITRAMFS} + fi + fi + + if [ ! -d $INITRAMFS ]; then + initramfs + fi if [ ! -d $SLITAZ_DIR/repos/wok ]; then hg clone $HG_URL/wok $SLITAZ/repos/wok fi - if [ ! -f $INCOMING_REPOSITORY/wok-depends.txt ]; then - [ -d $INCOMING_REPOSITORY ] || mkdir -p $INCOMING_REPOSITORY - tazwok gen-wok-db --WOK=$SLITAZ_DIR/repos/wok - fi + [ -d $INCOMING_REPOSITORY ] || mkdir -p $INCOMING_REPOSITORY + tazwok gen-wok-db --WOK=$SLITAZ_DIR/repos/wok for i in $(cat $PROFILE/packages.list); do look_for_dep $i > /tmp/deps @@ -281,6 +281,7 @@ if [ ! $(grep "^$d$" $ISODIR/packages-order.txt) ]; then [ -d $MODULES_DIR/$d ] || mkdir -p $MODULES_DIR/$d [ -f $MODULES_DIR/$d/receipt ] && continue + info "Make module of depend package $i" echo "$d" >> $ISODIR/packages-order.txt cd $MODULES_DIR/$d mktaz2xz $d $ISODIR/$CDNAME/base @@ -289,9 +290,10 @@ done fi if [ ! $(grep "^$i$" $ISODIR/packages-order.txt) ]; then - echo "$i" >> $ISODIR/packages-order.txt [ -d $MODULES_DIR/$i ] || mkdir -p $MODULES_DIR/$i [ -f $MODULES_DIR/$i/receipt ] && continue + echo "$i" >> $ISODIR/packages-order.txt + info "Make module of main package $i" cd $MODULES_DIR/$i mktaz2xz $i $ISODIR/$CDNAME/base cd $PROFILE