From f6097d503c8a61f16db5cb13eb93b17ecfd9a494 Mon Sep 17 00:00:00 2001 From: Simon Kok Date: Thu, 24 Oct 2024 23:10:53 +0200 Subject: [PATCH] Fix installer on ARM 64-bit ## Why? The QEMU multi-arch docker container should only be executed on x86 based architectures. ## What? Updated the installer to skip the QEMU docker container command if we are not running on a x86 based architecture. --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0786e52e4..56b2e5285 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Makefile versions -MAKEFILE_VERSION := 2.3.1 +MAKEFILE_VERSION := 2.3.2 UPDATE_VERSION := make/latest # This Makefile requires Python version 3.9 or later @@ -153,8 +153,13 @@ tox: deps ) docker: - @echo "Prepare docker to support all architectures..." - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + ( \ + RUNNING_ON_ARCH=$$(arch); \ + if [ "$$RUNNING_ON_ARCH" = "x86_64" ] || [ "$$RUNNING_ON_ARCH" = "i386" ]; then \ + echo "Prepare docker to support the required architectures..." && \ + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; \ + fi \ + ) version_number: .venv @echo "Generate a new version number..."