diff --git a/functions/architectures.sh b/functions/architectures.sh index aeb298eb3..01d2b1f74 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -91,35 +91,3 @@ Check_crossarchitectures () Check_architectures "${CROSS}" } - -Check_multiarchitectures () -{ - if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ] - then - # First, only support multiarch on iso - case "${LIVE_IMAGE_TYPE}" in - iso*) - # Assemble multi-arch - case "${LB_CURRENT_ARCHITECTURE}" in - amd64) - DESTDIR="${DESTDIR}.amd" - DESTDIR_LIVE="${DESTDIR_LIVE}.amd" - DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd" - ;; - - i386) - DESTDIR="${DESTDIR}.386" - DESTDIR_LIVE="${DESTDIR_LIVE}.386" - DESTDIR_INSTALL="${DESTDIR_INSTALL}.386" - ;; - - powerpc) - DESTDIR="${DESTDIR}.ppc" - DESTDIR_LIVE="${DESTDIR_LIVE}.ppc" - DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc" - ;; - esac - ;; - esac - fi -} diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy index bcd78b0e9..264b647b4 100755 --- a/scripts/build/binary_grub-legacy +++ b/scripts/build/binary_grub-legacy @@ -155,8 +155,6 @@ case "${LIVE_IMAGE_TYPE}" in ;; esac -Check_multiarchitectures - # Creating directory mkdir -p "${DESTDIR_LIVE}" diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc index b251fb64f..c2ad7d7af 100755 --- a/scripts/build/binary_grub-pc +++ b/scripts/build/binary_grub-pc @@ -59,8 +59,6 @@ case "${LIVE_IMAGE_TYPE}" in ;; esac -Check_multiarchitectures - # Copying templates mkdir -p binary/boot/grub/i386-pc diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index ae8ef45f6..49e04c756 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -60,8 +60,6 @@ case "${LB_ARCHITECTURES}" in ;; esac -Check_multiarchitectures - # Creating directory mkdir -p "${DESTDIR}" diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 13e6d1ba9..63a9363a5 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -151,8 +151,6 @@ case "${LB_INITRAMFS}" in ;; esac -Check_multiarchitectures - # Setting boot parameters if [ "${LB_UNION_FILESYSTEM}" != "overlay" ] then diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index 0c4a3f00e..221f77265 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -86,8 +86,6 @@ case "${LB_INITRAMFS}" in ;; esac -Check_multiarchitectures - # Creating directory mkdir -p "${DESTDIR}" diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index a06808282..f4fb4e70e 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -153,8 +153,6 @@ case "${LB_ARCHITECTURES}" in ;; esac -Check_multiarchitectures - Install_file() { local FILE FILE="${1}"