From 3ee87dcc3a0c2b0ea95fee0d40ec3c915d5d25f3 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 14 Jan 2025 19:17:06 +0100 Subject: [PATCH] build: fix S5CMD_ARCH calculation In image building, when building on arm based systems, the s5cmd tool was added with the wrong architecture (amd64 instead of arm64). This change fixes the architecture of the s5cmd to match the architecture of the image built. Fixes: #15262 Signed-off-by: Michael Adam (cherry picked from commit e34c41ce2c58b1452fd7afa46b1143cf6ab12c6f) --- images/ceph/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/ceph/Makefile b/images/ceph/Makefile index c97f6078c..70522d92e 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -35,7 +35,12 @@ ifeq ($(BUILD_CONTEXT_DIR),) BUILD_CONTEXT_DIR := $(shell mktemp -d) endif + +ifeq ($(GOARCH),amd64) S5CMD_ARCH = Linux-64bit +else +S5CMD_ARCH = Linux-arm64 +endif # s5cmd's version S5CMD_VERSION = 2.3.0