diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 18:58:35 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-01-04 18:58:35 +0100 |
| commit | 93592a81b66cca17cb791fc94af4af578b3da2f2 (patch) | |
| tree | f69ecddff1a1e6042a0f63a838119b3240e8c0ed /scripts/build/installer_debian-installer | |
| parent | 30122125be52e8b4470a1e9ef8decce5c55ff2cd (diff) | |
| download | vyos-live-build-93592a81b66cca17cb791fc94af4af578b3da2f2.tar.gz vyos-live-build-93592a81b66cca17cb791fc94af4af578b3da2f2.zip | |
Dropping some sparc leftovers (Closes: #774196).
Diffstat (limited to 'scripts/build/installer_debian-installer')
| -rwxr-xr-x | scripts/build/installer_debian-installer | 82 |
1 files changed, 23 insertions, 59 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 4ee9a8244..422c3b6d0 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -139,13 +139,6 @@ case "${LB_ARCHITECTURES}" in DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk" ;; - sparc) - DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')" - DI_REMOTE_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})" - DI_REMOTE_BASE_GTK="none" - - DI_REMOTE_BASE="cdrom" - ;; *) case "${DI_IMAGE_TYPE}" in netboot) @@ -283,49 +276,33 @@ esac mkdir -p "${DESTDIR_DI}" -if [ "${LB_ARCHITECTURES}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ] -then - # There are no prepared kernel/initrd pairs for sparc netboot so we - # must unpack them from a mini.iso - Download_file mini.iso ${URL}/mini.iso - - mkdir mini.tmp - mount -o loop -t iso9660 mini.iso mini.tmp +# Downloading debian-installer +Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL} +Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz - cp mini.tmp/boot/vmlinuz-${DEFAULT_FLAVOUR} "${DESTDIR}"/"${VMLINUZ_DI}" - cp mini.tmp/boot/initrd.gz "${DESTDIR}"/"${INITRD_DI}" - - umount mini.tmp - rm -rf mini.tmp mini.iso -else - # Downloading debian-installer - Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL} - Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz - - # Downloading graphical-installer - DOWNLOAD_GTK_INSTALLER=0 - if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ] - then +# Downloading graphical-installer +DOWNLOAD_GTK_INSTALLER=0 +if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ] +then case "${LB_ARCHITECTURES}" in - amd64|i386) - DOWNLOAD_GTK_INSTALLER=1 - ;; + amd64|i386) + DOWNLOAD_GTK_INSTALLER=1 + ;; - powerpc) - if [ "${LB_DEBIAN_INSTALLER}" = "netboot" ] - then - DOWNLOAD_GTK_INSTALLER=1 - fi - ;; - esac - fi + powerpc) + if [ "${LB_DEBIAN_INSTALLER}" = "netboot" ] + then + DOWNLOAD_GTK_INSTALLER=1 + fi + ;; + esac +fi - if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ] - then - mkdir -p "${DESTDIR_GI}" - Download_file "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} - Download_file "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz - fi +if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ] +then + mkdir -p "${DESTDIR_GI}" + Download_file "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL} + Download_file "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz fi # Only download additional packages if appropriate @@ -374,19 +351,6 @@ then esac ;; - sparc) - DI_REQ_PACKAGES="silo" - case "${LB_MODE}" in - ubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64" - ;; - - *) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-sparc64 linux-image-sparc64-smp" - ;; - esac - ;; - powerpc) DI_REQ_PACKAGES="yaboot" case "${LB_MODE}" in |