slitaz-arm rev 20

sat: minor update
author Christophe Lincoln <pankso@slitaz.org>
date Tue Feb 18 22:50:38 2014 +0100 (2014-02-18)
parents 654573f60194
children e91aece56609
files sat
line diff
     1.1 --- a/sat	Sat Jun 02 12:48:53 2012 +0200
     1.2 +++ b/sat	Tue Feb 18 22:50:38 2014 +0100
     1.3 @@ -36,7 +36,7 @@
     1.4    --kmap     Include the system keymap config in the distro
     1.5    --work=    Path to work dir with packages and rootfs
     1.6    --size=    Specify optional vdisk size (default 20Mb)
     1.7 -  --init=    Specify the initramfs compression: gz xz
     1.8 +  --init=    Specify the initramfs compression: gz bz2 xz
     1.9  
    1.10  EOT
    1.11  }
    1.12 @@ -47,8 +47,8 @@
    1.13  	[ "$forced" ] && rm -f ID
    1.14  	[ -f "ID" ] || echo $$ > ID
    1.15  	mv ID ID.bak
    1.16 -	if wget -qs ${mirror%/}/ID; then
    1.17 -		wget -q ${mirror%/}/ID
    1.18 +	if busybox wget -qs ${mirror%/}/ID 2>/dev/null; then
    1.19 +		busybox wget -q ${mirror%/}/ID
    1.20  	else
    1.21  		gettext "Mirror is unreachable"; false
    1.22  		status && return 1
    1.23 @@ -118,7 +118,8 @@
    1.24  		mkdir run
    1.25  
    1.26  		# Update modules.dep
    1.27 -		depmod -b . 3.2.14-slitaz
    1.28 +		. var/lib/tazpkg/installed/linux/receipt
    1.29 +		depmod -b . ${VERSION}-slitaz
    1.30  
    1.31  		# Custom rootfs: make sure all files belong to root.
    1.32  		if [ -d "$work/rootfs" ]; then
    1.33 @@ -137,7 +138,7 @@
    1.34  		# Rootfs cpio: gzip xz --> /usr/lib/slitaz/liblive.sh ???
    1.35  		echo -n "Compressing initramfs: $initramfs"
    1.36  		case $initramfs in
    1.37 -			*.bz) find . | cpio -o -H newc | bzip2 > ../$initramfs ;;
    1.38 +			*.bz2) find . | cpio -o -H newc | bzip2 > ../$initramfs ;;
    1.39  			*.gz) find . | cpio -o -H newc | gzip -9 > ../$initramfs ;;
    1.40  			*.xz) find . | cpio -o -H newc | xz -9 --format=lzma \
    1.41  					> ../$initramfs ;;
    1.42 @@ -187,7 +188,7 @@
    1.43  			if [ ! -f "$pkg" ]; then
    1.44  				count=$(($count + 1))
    1.45  				[ "$count" == 1 ] && newline
    1.46 -				echo -n "Fetching: ${pkg}.tazpkg"
    1.47 +				echo -n "Fetching: ${pkg}"
    1.48  				wget -q ${mirror%/}/$pkg
    1.49  				status
    1.50  			fi