From 7206603249407c9537ab1109e1847cc7282fba0e Mon Sep 17 00:00:00 2001 From: Denis Baryshev Date: Sat, 11 Jan 2025 16:39:42 +0700 Subject: [PATCH 1/2] chore: add single arch support Signed-off-by: Denis Baryshev --- .github/workflows/verify.yml | 1 - Makefile | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index ba0f30f..5975176 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -30,4 +30,3 @@ jobs: - name: Build multi-arch images and binaries run: make clean multiarch-tar - diff --git a/Makefile b/Makefile index e341670..28c3e02 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,10 @@ multiarch-tar: BUILDX_OUTPUT = type=local,dest=$(IMAGE_EXPORT_DIR) multiarch-tar: TAR_TARGET ?= tar multiarch-tar: images tar-all +# Single arch builds don't have nested arch directory, thus set path as for multiarch +singlearch-tar: BUILDX_OUTPUT = type=local,dest=$(IMAGE_EXPORT_DIR)/linux_$(ARCH) +singlearch-tar: images tar + multiarch-images: BUILDX_OUTPUT = type=image multiarch-images: images From b5a6cbc9cd6e8cec9a7019911b768679bbf41870 Mon Sep 17 00:00:00 2001 From: Denis Baryshev Date: Sun, 12 Jan 2025 22:50:06 +0700 Subject: [PATCH 2/2] chore: fix singlearch build Signed-off-by: Denis Baryshev --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 28c3e02..2a95c99 100644 --- a/Makefile +++ b/Makefile @@ -40,13 +40,16 @@ multiarch-tar: BUILDX_OUTPUT = type=local,dest=$(IMAGE_EXPORT_DIR) multiarch-tar: TAR_TARGET ?= tar multiarch-tar: images tar-all -# Single arch builds don't have nested arch directory, thus set path as for multiarch -singlearch-tar: BUILDX_OUTPUT = type=local,dest=$(IMAGE_EXPORT_DIR)/linux_$(ARCH) -singlearch-tar: images tar - multiarch-images: BUILDX_OUTPUT = type=image multiarch-images: images +# Single arch builds don't have nested arch directory, thus set path as for multiarch +singlearch-tar: BUILDX_OUTPUT = type=local,dest=$(IMAGE_EXPORT_DIR)/linux_$(ARCH) +singlearch-tar: TAR_TARGET ?= tar +singlearch-tar: images +singlearch-tar: + make $(TAR_TARGET) PLATFORM="$(PLATFORM)" BUILDX_BUILDER="$(BUILDX_BUILDER)" + tar-all: @{ \ set -e ;\