diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-04 20:11:07 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-04 20:11:07 +0100 |
| commit | ad4b03871ecb43596df6c33a98642699b006532d (patch) | |
| tree | 2f68e905819c2b21f26777a7f275924a711f0ccd /make/vars.mk | |
| parent | 4ef4bbd4ad280c17dd8b6856edd87173fddb00e7 (diff) | |
moves container.mk vars to vars.mk so that IMAGE_PREFIX is defined
before it is used in COMPOSE_CMD
Diffstat (limited to 'make/vars.mk')
| -rw-r--r-- | make/vars.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/make/vars.mk b/make/vars.mk index d3be3b7..12f93f7 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -55,6 +55,10 @@ INSTALL_RULES := $(foreach module,$(MODULES),install_$(module)) REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module)) UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module)) +CPU_ARCH := $(if $(shell which arch 2>/dev/null),\ + $(shell arch),\ + $(shell lscpu | grep ^Architecture: | sed "s/^Architecture:[[:space:]]*\([[:alnum:][:punct:]]\+\).*/\1/")) +IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/) COMPOSE_CMD := \ ALPINE_VERSION="$(ALPINE_VERSION)" \ IMAGE_PREFIX="$(IMAGE_PREFIX)" \ |