From a5bd0ed8ce9371b95273a41a2d030f2fee7a3f50 Mon Sep 17 00:00:00 2001
From: Roland Clobus <rclobus@rclobus.nl>
Date: Sun, 28 Apr 2024 21:59:14 +0200
Subject: [PATCH] Architecture checking is not required any more

The qemu-static binary on the host runs the foreign binaries
---
 functions/architectures.sh          | 81 -----------------------------
 scripts/build/binary_grub-efi       |  4 --
 scripts/build/binary_grub-legacy    |  4 --
 scripts/build/binary_grub-pc        |  4 --
 scripts/build/binary_grub_cfg       |  4 --
 scripts/build/binary_syslinux       |  4 --
 scripts/build/bootstrap_cache       |  3 --
 scripts/build/bootstrap_debootstrap |  3 --
 8 files changed, 107 deletions(-)
 delete mode 100755 functions/architectures.sh

diff --git a/functions/architectures.sh b/functions/architectures.sh
deleted file mode 100755
index 13140c31b..000000000
--- a/functions/architectures.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2016-2020 The Debian Live team
-## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-Check_architectures ()
-{
-	local ARCHITECTURE
-	for ARCHITECTURE in "${@}"; do
-		if [ "${ARCHITECTURE}" = "${LB_ARCHITECTURE}" ]; then
-			return
-		fi
-
-		if [ "${ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" ]; then
-			if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ]; then
-				Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_ARCHITECTURE} was not found" "${0}"
-				continue
-			fi
-
-			if [ ! -x "${LB_BOOTSTRAP_QEMU_STATIC}" ]; then
-				Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_STATIC} is not executable" "${0}"
-				continue
-			fi
-
-			return
-		fi
-	done
-
-	Echo_warning "skipping %s, foreign architecture(s)." "${0}"
-	exit 0
-}
-
-Check_crossarchitectures ()
-{
-	local HOST
-	if command -v dpkg >/dev/null; then
-		HOST="$(dpkg --print-architecture)"
-	else
-		HOST="$(uname -m)"
-	fi
-
-	local CROSS
-	case "${HOST}" in
-		amd64|i386|x86_64)
-			CROSS="amd64 i386"
-			;;
-
-		arm64)
-			CROSS="arm64 armhf armel"
-			;;
-
-		powerpc|ppc64)
-			CROSS="powerpc ppc64"
-			;;
-
-		*)
-			CROSS="${HOST}"
-			;;
-	esac
-
-	if [ "${LB_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" ]; then
-		if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ]; then
-			Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_ARCHITECTURE} was not found" "${0}"
-			exit 0
-		fi
-
-		if [ ! -x "${LB_BOOTSTRAP_QEMU_STATIC}" ]; then
-			Echo_warning "skipping %s, qemu-static binary ${LB_BOOTSTRAP_QEMU_STATIC} is not executable" "${0}"
-			exit 0
-		fi
-		return
-	fi
-
-	Check_architectures ${CROSS}
-}
diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi
index 596b0f5f4..41a8c526e 100755
--- a/scripts/build/binary_grub-efi
+++ b/scripts/build/binary_grub-efi
@@ -42,10 +42,6 @@ Check_stagefile
 # Acquire lock file
 Acquire_lockfile
 
-# Check architecture
-Check_architectures amd64 i386 arm64 armhf
-Check_crossarchitectures
-
 # Checking depends
 case "${LB_ARCHITECTURE}" in
 	amd64|i386)
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index 1b5f3ebb6..e384a2145 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -40,10 +40,6 @@ Check_stagefile
 # Acquire lock file
 Acquire_lockfile
 
-# Check architecture
-Check_architectures amd64 i386
-Check_crossarchitectures
-
 # Checking depends
 Check_package chroot /usr/sbin/grub grub-legacy
 
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index 5f1e7534a..9ca7ebcba 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -42,10 +42,6 @@ Check_stagefile
 # Acquire lock file
 Acquire_lockfile
 
-# Check architecture
-Check_architectures amd64 i386
-Check_crossarchitectures
-
 # Checking depends
 Check_package chroot /usr/bin/grub-mkimage grub-common
 Check_package chroot /usr/lib/grub/i386-pc/vga.mod grub-pc-bin
diff --git a/scripts/build/binary_grub_cfg b/scripts/build/binary_grub_cfg
index c41a4fba4..0a9b7e074 100755
--- a/scripts/build/binary_grub_cfg
+++ b/scripts/build/binary_grub_cfg
@@ -38,10 +38,6 @@ Check_stagefile
 # Acquire lock file
 Acquire_lockfile
 
-# Check architecture
-Check_architectures amd64 i386 arm64
-Check_crossarchitectures
-
 _TARGET="binary/boot/grub"
 
 # Local functions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index caf48c49a..21587f2e3 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -36,10 +36,6 @@ Check_stagefile
 # Acquire lock file
 Acquire_lockfile
 
-# Check architecture
-Check_architectures amd64 i386
-Check_crossarchitectures
-
 case "${LB_INITRAMFS}" in
 	live-boot)
 		_INITRAMFS="live"
diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache
index cc1ac755e..6bc9b3029 100755
--- a/scripts/build/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@@ -24,9 +24,6 @@ Init_config_data "${@}"
 _ACTION="${1}"
 shift
 
-# Check architecture
-Check_crossarchitectures
-
 if ! In_list "bootstrap" ${LB_CACHE_STAGES}; then
 	exit 0
 fi
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index c5e460542..4577a3331 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -27,9 +27,6 @@ then
 	exit 1
 fi
 
-# Check architecture
-Check_crossarchitectures
-
 Echo_message "Begin bootstrapping system..."
 
 Check_package host /usr/sbin/debootstrap debootstrap