[SCM] live-build branch, debian-next, updated. debian/3.0_a33-1-6-g6b8183c

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6b8183c277c3306d3d497f0479fb0545b9d3d990
Author: Ben Howard <ben.howard at canonical.com>
Date:   Thu Sep 29 13:04:17 2011 -0600

    Setting default armel linux flavour for Ubuntu.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 83cb6d0..ef218d1 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -636,9 +636,16 @@ Set_defaults ()
 	# Setting linux flavour string
 	case "${LB_ARCHITECTURES}" in
 		armel)
-			# 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}"
+			case "${LB_MODE}" in
+                                ubuntu|kubuntu)
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}"
+					;;
+				*)
+					# 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}"
+					;;
+			esac
 			;;
 
 		amd64)

-- 
live-build