slitaz-arm rev 63

sat: few fixes
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 15 18:46:41 2014 +0100 (2014-03-15)
parents f74a9206fdd0
children d56078bca4e9
files sat sat-rpi
line diff
     1.1 --- a/sat	Sat Mar 15 18:09:54 2014 +0100
     1.2 +++ b/sat	Sat Mar 15 18:46:41 2014 +0100
     1.3 @@ -224,6 +224,7 @@
     1.4  		fi
     1.5  		
     1.6  		# Move /boot outside the rootfs
     1.7 +		mkdir -p ${rootfs}/boot
     1.8  		if [ "$(ls $rootfs/boot | wc -l)" != 0 ]; then
     1.9  			echo -n "Moving /boot outside the rootfs..."
    1.10  			mkdir -p ${distro}/boot
    1.11 @@ -303,7 +304,11 @@
    1.12  			for dep in $DEPENDS
    1.13  			do
    1.14  				if [ ! -d "${installed}/$dep" ]; then
    1.15 -					echo -n "$(colorize 34 $PACKAGE)" && indent 24 "$dep"
    1.16 +					if [ ! "$raw" ]; then
    1.17 +						echo -n "$(colorize 34 $PACKAGE)" && indent 24 "$dep"
    1.18 +					else
    1.19 +						echo "$dep"
    1.20 +					fi
    1.21  					count=$(($count + 1))
    1.22  				fi
    1.23  			done
     2.1 --- a/sat-rpi	Sat Mar 15 18:09:54 2014 +0100
     2.2 +++ b/sat-rpi	Sat Mar 15 18:46:41 2014 +0100
     2.3 @@ -221,6 +221,7 @@
     2.4  		
     2.5  		boldify "SliTaz Raspberry Pi distro"
     2.6  		separator
     2.7 +		mkdir -p ${boot}
     2.8  		
     2.9  		# Custom RPi rootfs: make sure all files belong to root
    2.10  		if [ -d "$rpi/rootfs" ]; then
    2.11 @@ -231,12 +232,13 @@
    2.12  			cp -r $rpi/rootfs/* $tmp
    2.13  			chown -R root.root $tmp
    2.14  			cp -a $tmp/* ${rootfs} && rm -rf $tmp
    2.15 +			mv -f ${rootfs}/boot/* ${boot}
    2.16  			status
    2.17  		fi
    2.18  		
    2.19  		# Boot firmware
    2.20  		echo -n "Copying: firmware files..."
    2.21 -		mkdir -p ${boot} && get_fw
    2.22 +		get_fw
    2.23  		for fw in $fwlist
    2.24  		do
    2.25  			cp ${firmware}/boot/${fw} ${boot}