summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-07-04 22:28:20 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:36 +0100
commite4e77a0c91847688b215d7895bd8c64df57a94bf (patch)
tree8d94dba0fb19bae1bbdeb9d8a705365e30570ba2 /helpers
parente7b0c3b78acd8df60c2e92cb4cd48780506cd656 (diff)
downloadlive-build-e4e77a0c91847688b215d7895bd8c64df57a94bf.zip
live-build-e4e77a0c91847688b215d7895bd8c64df57a94bf.tar.gz
Refactor d-i GTK image selection, ensuring the GTK installer is only chosen on the netboot variant when building on powerpc.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_debian-installer22
1 files changed, 17 insertions, 5 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 2a79521..90d00f1 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -304,13 +304,25 @@ else
wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
# Downloading graphical-installer
+ DOWNLOAD_GTK_INSTALLER=0
case "${LH_ARCHITECTURE}" in
- amd64|i386|powerpc)
- mkdir -p "${DESTDIR_GI}"
- wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
- wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
- ;;
+ amd64|i386)
+ DOWNLOAD_GTK_INSTALLER=1
+ ;;
+ powerpc)
+ if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ]
+ then
+ DOWNLOAD_GTK_INSTALLER=1
+ fi
+ ;;
esac
+
+ if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ]
+ then
+ mkdir -p "${DESTDIR_GI}"
+ wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
+ wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
+ fi
fi
# Only download additional packages if appropriate