[SCM] live-build branch, debian-next, updated. debian/3.0_a60-1-4-g7ae630c

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 7ae630cc4388a7fc01fb58351556a7cb1409bb69
Author: Adam Conrad <adconrad at ubuntu.com>
Date:   Sun Sep 30 09:26:12 2012 +0200

    Switching Ubuntu from powerpc to powerpc-smp kernel.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index cc5c92d..e1c640c 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -765,11 +765,11 @@ Set_defaults ()
 				ubuntu|kubuntu)
 					case "${LIST}" in
 						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}"
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}"
 							;;
 
 						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64-smp}"
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}"
 							;;
 					esac
 					;;
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index dd8a4d5..1a85439 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -383,7 +383,7 @@ then
 			DI_REQ_PACKAGES="yaboot"
 			case "${LB_MODE}" in
 				ubuntu|kubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp"
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp"
 					;;
 
 				*)

-- 
live-build