[SCM] live-build branch, debian-next, updated. debian/3.0_a25-1-46-g6a577d3

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6a577d37f61b456bdb44d1f7bd059a5152b4dff3
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Jul 29 15:26:58 2011 +0200

    Setting default kernel flavours for armel to all available flavour due to the nature of armel images (single rootfs image, multiple kernel images).

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 701ae3a..38c60de 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -614,12 +614,9 @@ Set_defaults ()
 	# Setting linux flavour string
 	case "${LB_ARCHITECTURES}" in
 		armel)
-			if [ -z "${LB_LINUX_FLAVOURS}" ]
-			then
-				Echo_error "There is no default kernel flavour defined for your architecture."
-				Echo_error "Please configure it manually with 'lb config -k FLAVOUR'."
-				exit 1
-			fi
+			# armel will have special images: one rootfs image and many additional kernel images.
+			# therefore we default to all available armel flavours
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
 			;;
 
 		amd64)

-- 
live-build