[SCM] live-build branch, debian-next, updated. debian/3.0_a9-1-8-g8a0c42a

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 8a0c42acd96e941a42b0c8b712046aafb487296d
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 13 23:29:07 2010 +0100

    Applying patch from Cody A.W. Somerville <cody.somerville at canonical.com> to update kernel packages for ubuntu in lb_binary_debian-installer.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index f5ea984..5a42027 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -328,7 +328,7 @@ then
 
 			case "${LB_MODE}" in
 				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
 					;;
 
 				*)
@@ -343,7 +343,7 @@ then
 
 			case "${LB_MODE}" in
 				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
 					;;
 
 				*)
@@ -354,12 +354,28 @@ then
 
 		sparc)
 			DI_REQ_PACKAGES="silo"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp"
+			case "${LB_MODE}" in
+				ubuntu)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64"
+					;;
+
+				*)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp"
+					;;
+			esac
 			;;
 
 		powerpc)
 			DI_REQ_PACKAGES="yaboot"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp"
+			case "${LB_MODE}" in
+				ubuntu)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp"
+					;;
+
+				*)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp"
+					;;
+			esac
 			;;
 	esac
 

-- 
live-build