Refactor d-i GTK image selection, ensuring the GTK installer is only chosen on the netboot variant when building on powerpc.
This commit is contained in:
parent
e7b0c3b78a
commit
e4e77a0c91
|
@ -304,13 +304,25 @@ else
|
||||||
wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
|
wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
|
||||||
|
|
||||||
# Downloading graphical-installer
|
# Downloading graphical-installer
|
||||||
|
DOWNLOAD_GTK_INSTALLER=0
|
||||||
case "${LH_ARCHITECTURE}" in
|
case "${LH_ARCHITECTURE}" in
|
||||||
amd64|i386|powerpc)
|
amd64|i386)
|
||||||
mkdir -p "${DESTDIR_GI}"
|
DOWNLOAD_GTK_INSTALLER=1
|
||||||
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
|
powerpc)
|
||||||
;;
|
if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ]
|
||||||
|
then
|
||||||
|
DOWNLOAD_GTK_INSTALLER=1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
esac
|
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
|
fi
|
||||||
|
|
||||||
# Only download additional packages if appropriate
|
# Only download additional packages if appropriate
|
||||||
|
|
Loading…
Reference in New Issue