From 34ae9036e63b440433a8aabf3c33bf2254e6ad85 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 13 Dec 2010 23:28:56 +0100
Subject: Applying patch from Cody A.W. Somerville
 <cody.somerville@canonical.com> to update kernel packages for ubuntu in
 lb_binary_debian-installer.

---
 scripts/build/lb_binary_debian-installer | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 724b80e..e2d9d7c 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
 
-- 
cgit v1.0