From e2d8217ff86267b496309c66f1189ed5a52e8290 Mon Sep 17 00:00:00 2001 From: desertwitch <24509509+desertwitch@users.noreply.github.com> Date: Wed, 18 Feb 2026 10:22:40 +0100 Subject: [PATCH] fix(nwipe): evaluate variables on use --- package/nwipe/nwipe.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nwipe/nwipe.mk b/package/nwipe/nwipe.mk index b7e685e7cc..49b41b3345 100644 --- a/package/nwipe/nwipe.mk +++ b/package/nwipe/nwipe.mk @@ -38,14 +38,14 @@ SHREDOS_VERSION_FILE = board/shredos/fsoverlay/etc/shredos/version.txt # If version contains a dot, treat it as a release tag ifneq ($(findstring .,$(NWIPE_VERSION)),) -NWIPE_VERSION_BANNER := $(NWIPE_VERSION) +NWIPE_VERSION_BANNER = $(NWIPE_VERSION) else # Otherwise assume it is a development version by hash -NWIPE_VERSION_BANNER := $(shell printf "%.7s-commit-dev" "$(NWIPE_VERSION)") +NWIPE_VERSION_BANNER = $(shell printf "%.7s-commit-dev" "$(NWIPE_VERSION)") endif # Normalize x86_64 to x86-64 for version -NWIPE_VARCH := $(if $(filter x86_64,$(BR2_ARCH)),x86-64,$(BR2_ARCH)) +NWIPE_VARCH = $(if $(filter x86_64,$(strip $(BR2_ARCH))),x86-64,$(BR2_ARCH)) define NWIPE_UPDATE_VERSION_TXT echo "Updating version.txt: arch=$(NWIPE_VARCH) banner=$(NWIPE_VERSION_BANNER)"