slitaz-arm rev 144

sat: exit if wrong flavor, add cgi-adm packge to rpi-flavors
author Christophe Lincoln <pankso@slitaz.org>
date Tue Apr 29 18:20:48 2014 +0200 (2014-04-29)
parents 9259857e24b9
children c065b70fa0b2
files flavors/rpi-base/packages.list flavors/rpi-desktop/packages.list sat sat-rpi
line diff
     1.1 --- a/flavors/rpi-base/packages.list	Mon Apr 28 22:02:06 2014 +0200
     1.2 +++ b/flavors/rpi-base/packages.list	Tue Apr 29 18:20:48 2014 +0200
     1.3 @@ -6,6 +6,7 @@
     1.4  slitaz-base-files
     1.5  slitaz-boot-scripts
     1.6  slitaz-configs-base
     1.7 +slitaz-arm-adm
     1.8  slitaz-arm-rpi
     1.9  slitaz-tools
    1.10  spk
     2.1 --- a/flavors/rpi-desktop/packages.list	Mon Apr 28 22:02:06 2014 +0200
     2.2 +++ b/flavors/rpi-desktop/packages.list	Tue Apr 29 18:20:48 2014 +0200
     2.3 @@ -6,8 +6,9 @@
     2.4  slitaz-base-files
     2.5  slitaz-boot-scripts
     2.6  slitaz-configs-base
     2.7 +slitaz-arm-adm
     2.8 +slitaz-arm-configs
     2.9  slitaz-arm-rpi
    2.10 -slitaz-arm-configs
    2.11  slitaz-tools
    2.12  slitaz-icon
    2.13  slitaz-polar-cursors
    2.14 @@ -112,4 +113,5 @@
    2.15  alsa-utils
    2.16  mpg123
    2.17  lua
    2.18 +sqlite
    2.19  raspberrypi-boot
     3.1 --- a/sat	Mon Apr 28 22:02:06 2014 +0200
     3.2 +++ b/sat	Tue Apr 29 18:20:48 2014 +0200
     3.3 @@ -56,6 +56,10 @@
     3.4  EOT
     3.5  }
     3.6  
     3.7 +error() {
     3.8 +	echo "[ $(colorize 31 'ERROR') ] $@"
     3.9 +}
    3.10 +
    3.11  # --> use libpkg.sh when released (function is shared with spk)
    3.12  # Check mirror ID: return 1 if no changes or mirror unreachable
    3.13  check_mirror_id() {
    3.14 @@ -86,6 +90,12 @@
    3.15  		separator
    3.16  		rm -rf ${distro} && mkdir -p ${rootfs} ${cache}
    3.17  		
    3.18 +		# We need a valid flavor
    3.19 +		if [ "$flavor" ] && [ ! -f "$flavors/$flavor/packages.list" ]; then
    3.20 +			error "Missing '$flavor' flavor packages.list" 
    3.21 +			newline && exit 1
    3.22 +		fi
    3.23 +		
    3.24  		# Get --flavor= packages lists
    3.25  		if [ "$flavor" ]; then
    3.26  			echo -n "Getting $flavor packages.list..."
     4.1 --- a/sat-rpi	Mon Apr 28 22:02:06 2014 +0200
     4.2 +++ b/sat-rpi	Tue Apr 29 18:20:48 2014 +0200
     4.3 @@ -150,7 +150,8 @@
     4.4  		
     4.5  		# We may want to simply regenerate the RPi distro
     4.6  		if [ ! "$nosat" ]; then
     4.7 -			sat gen --work="$work" --flavor="$flavor" --noinit --nolinux
     4.8 +			sat gen --work="$work" --flavor="$flavor" \
     4.9 +				--noinit --nolinux || exit 1
    4.10  		else
    4.11  			newline
    4.12  		fi