From 34a26b8cc9d9c68698e66c13b8bbd43439704a98 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 24 Dec 2024 13:19:32 +0000 Subject: [PATCH] fix(Makefile): improve build process for arm64 --- Makefile | 6 +++--- scripts/sysbox_sha.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100755 scripts/sysbox_sha.sh diff --git a/Makefile b/Makefile index 0ca723b..c51d8d4 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ PROJECT_ROOT := $(shell git rev-parse --show-toplevel) GO_FILES := $(shell git ls-files '*.go' '*.sum') IMAGE_FILES := $(shell find deploy) -ARCH ?= linux/amd64 -SYSBOX_SHA ?= f02ffb48eae99d6c884c9aa0378070cc716d028f58e87deec5ae00a41b706fe8 +ARCH := "linux/$(shell go env GOARCH)" +SYSBOX_SHA := $(shell ARCH=$(ARCH) ./scripts/sysbox_sha.sh) .PHONY: clean clean: rm -rf build build/envbox: $(GO_FILES) - CGO_ENABLED=0 go build -o build/envbox ./cmd/envbox + CGO_ENABLED=0 GOOS=linux go build -o build/envbox ./cmd/envbox .PHONY: build/image/envbox build/image/envbox: build/image/envbox/.ctx diff --git a/scripts/sysbox_sha.sh b/scripts/sysbox_sha.sh new file mode 100755 index 0000000..12a7efe --- /dev/null +++ b/scripts/sysbox_sha.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +declare -A sysbox_shas +sysbox_shas["linux/amd64"]="f02ffb48eae99d6c884c9aa0378070cc716d028f58e87deec5ae00a41b706fe8" +sysbox_shas["linux/arm64"]="d9267eb176190b96dcfa29ba4c4c685a26a4a1aca1d7f15deb31ec33ed63de15" + +ARCH="${ARCH:-linux/amd64}" +printf "%s" "${sysbox_shas[$ARCH]}"