tazwok rev 476 4.3

Merge bugfixes from default
author Antoine Bodin <gokhlayeh@slitaz.org>
date Mon Apr 04 03:05:44 2011 +0200 (2011-04-04)
parents 70132bd3161d c545a19df5b5
children d5577ee760d9
files chroot-scripts/cook-toolchain tazwok
line diff
     1.1 --- a/chroot-scripts/gen-iso	Sat Apr 02 14:47:30 2011 +0200
     1.2 +++ b/chroot-scripts/gen-iso	Mon Apr 04 03:05:44 2011 +0200
     1.3 @@ -29,7 +29,7 @@
     1.4  	sed "/^ISO_NAME/ s/$1/$SLITAZ_VERSION-$1/" -i tazlito.conf
     1.5  	[ "$2" = gzip ] && echo "COMPRESSION=gzip" >> tazlito.conf
     1.6  	echo -e "\n" | tazlito gen-distro || report exit "Generation of iso failed"
     1.7 -	cp $SLITAZ_DIR/distro/*.iso $SLITAZ_DIR/distro/*.md5 $LOCAL_REPOSITORY/iso
     1.8 +	cp $LOCAL_REPOSITORY/distro/*.iso $LOCAL_REPOSITORY/distro/*.md5 $LOCAL_REPOSITORY/iso
     1.9  	clean-chroot
    1.10  	report stop
    1.11  else
     2.1 --- a/tazwok	Sat Apr 02 14:47:30 2011 +0200
     2.2 +++ b/tazwok	Mon Apr 04 03:05:44 2011 +0200
     2.3 @@ -1909,9 +1909,9 @@
     2.4  		cat $tmp/dep | sort -u
     2.5  	fi
     2.6  	rm -f $tmp/dep $tmp/list
     2.7 +	sort -o $dep_db $dep_db
     2.8 +	sort -o $wan_db $wan_db
     2.9  	if [ "$db_md5" != "$(md5sum $dep_db $wan_db)" ]; then
    2.10 -		sort -o $dep_db $dep_db
    2.11 -		sort -o $wan_db $wan_db
    2.12  		grep -q "^#" $cookorder || sed 1i"#PlanSort" -i $cookorder
    2.13  	fi
    2.14  }
    2.15 @@ -2845,9 +2845,9 @@
    2.16  		db_md5=$(md5sum $dep_db $wan_db)
    2.17  		update_wan_db
    2.18  		check_for_commit
    2.19 +		sort -o $dep_db $dep_db
    2.20 +		sort -o $wan_db $wan_db
    2.21  		if [ "$db_md5" != "$(md5sum $dep_db $wan_db)" ]; then
    2.22 -			sort -o $dep_db $dep_db
    2.23 -			sort -o $wan_db $wan_db
    2.24  			grep -q "^#" $cookorder || sed 1i"#PlanSort" -i $cookorder
    2.25  		fi
    2.26  		cook