From f5da1f0bf3fe74e86f580dda25ebc08d1247189e Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Tue, 28 Jan 2025 09:54:40 -0500
Subject: [PATCH] Make handling of cross-platform emulation for static builds
 smarter. (#19470)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Switch to tonistiigi/binfmt for cross-build emulation.

It’s actually being actively updated, and it also supports hosts other
than x86-64.

* Auto-detect existing QEMU user emulation in static build.

Instead of relying on the user to explicitly ask for no emulation.
---
 packaging/makeself/build-static.sh | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packaging/makeself/build-static.sh b/packaging/makeself/build-static.sh
index daca0d8e9d2793..96713a49a3f423 100755
--- a/packaging/makeself/build-static.sh
+++ b/packaging/makeself/build-static.sh
@@ -24,45 +24,47 @@ else
     exit 1
 fi
 
-DOCKER_IMAGE_NAME="netdata/static-builder:v1"
-
-if [ "${BUILDARCH}" != "$(uname -m)" ] && [ -z "${SKIP_EMULATION}" ]; then
-    if [ "$(uname -m)" = "x86_64" ]; then
-        ${docker} run --rm --privileged multiarch/qemu-user-static --reset -p yes || exit 1
-    else
-        echo "Automatic cross-architecture builds are only supported on x86_64 hosts."
-        exit 1
-    fi
-fi
-
 case "${BUILDARCH}" in
     x86_64) # x86-64-v2 equivalent
+        QEMU_ARCH="x86_64"
         QEMU_CPU="Nehalem-v2"
         TUNING_FLAGS="-march=x86-64"
         GOAMD64="v1"
         ;;
     armv6l) # Raspberry Pi 1 equivalent
+        QEMU_ARCH="arm"
         QEMU_CPU="arm1176"
         TUNING_FLAGS="-march=armv6zk -mtune=arm1176jzf-s"
         GOARM="6"
         ;;
     armv7l) # Baseline ARMv7 CPU
+        QEMU_ARCH="arm"
         QEMU_CPU="cortex-a7"
         TUNING_FLAGS="-march=armv7-a"
         GOARM="7"
         ;;
     aarch64) # Baseline ARMv8 CPU
+        QEMU_ARCH="aarch64"
         QEMU_CPU="cortex-a53"
         TUNING_FLAGS="-march=armv8-a"
         GOARM64="v8.0"
         ;;
     ppc64le) # Baseline POWER8+ CPU
+        QEMU_ARCH="ppc64le"
         QEMU_CPU="power8nvl"
         TUNING_FLAGS="-mcpu=power8 -mtune=power9"
         GOPPC64="power8"
         ;;
 esac
 
+[ -f "/proc/sys/fs/binfmt_misc/qemu-${QEMU_ARCH}" ] && SKIP_EMULATION=1
+
+if [ "${BUILDARCH}" != "$(uname -m)" ] && [ -z "${SKIP_EMULATION}" ]; then
+    ${docker} run --rm --privileged tonistiigi/binfmt:master --install "${QEMU_ARCH}" || exit 1
+fi
+
+DOCKER_IMAGE_NAME="netdata/static-builder:v1"
+
 if ${docker} inspect "${DOCKER_IMAGE_NAME}" > /dev/null 2>&1; then
     if ${docker} image inspect "${DOCKER_IMAGE_NAME}" | grep -q 'Variant'; then
         img_platform="$(${docker} image inspect "${DOCKER_IMAGE_NAME}" --format '{{.Os}}/{{.Architecture}}/{{.Variant}}')"