summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-12-13 23:28:56 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:31 +0100
commit34ae9036e63b440433a8aabf3c33bf2254e6ad85 (patch)
treefb1387582bfd9c3ad3e05a3a5b1e3fc5c7e7faee /scripts/build
parentb97534b112006cb4ad82bf9f081ed6322b39a45e (diff)
downloadlive-build-34ae9036e63b440433a8aabf3c33bf2254e6ad85.zip
live-build-34ae9036e63b440433a8aabf3c33bf2254e6ad85.tar.gz
Applying patch from Cody A.W. Somerville <cody.somerville@canonical.com> to update kernel packages for ubuntu in lb_binary_debian-installer.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary_debian-installer24
1 files 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