From: Sven Roederer Date: Thu, 11 May 2023 10:42:12 +0000 (+0200) Subject: build: escape whitespaces in VERSION_DIST for Netgear images X-Git-Tag: v22.03.6~120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a99d9cf70e5295516ec66036c8e6bbbfc8e9ee;p=thirdparty%2Fopenwrt.git build: escape whitespaces in VERSION_DIST for Netgear images Prevents subshell commands from failing to parse options when having defined a whitespace in the VERSION_DIST. As the called resulting images unlikely will handle whitespace correctly, we replace them by "-". Signed-off-by: Sven Roederer (cherry picked from commit 4071398b13aeee873cb5a48b00b6c90074763d5f) --- diff --git a/include/image-commands.mk b/include/image-commands.mk index 402e3d71edb..604b419b683 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -378,7 +378,7 @@ endef define Build/netgear-dni $(STAGING_DIR_HOST)/bin/mkdniimg \ - -B $(NETGEAR_BOARD_ID) -v $(VERSION_DIST).$(firstword $(subst -, ,$(REVISION))) \ + -B $(NETGEAR_BOARD_ID) -v $(shell cat $(VERSION_DIST)| sed -e 's/[[:space:]]/-/g').$(firstword $(subst -, ,$(REVISION))) \ $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \ -r "$(1)" \ -i $@ -o $@.new @@ -391,7 +391,7 @@ define Build/netgear-encrypted-factory --output-file $@ \ --model $(NETGEAR_ENC_MODEL) \ --region $(NETGEAR_ENC_REGION) \ - --version V1.0.0.0.$(VERSION_DIST).$(firstword $(subst -, ,$(REVISION))) \ + --version V1.0.0.0.$(shell cat $(VERSION_DIST)| sed -e 's/[[:space:]]/-/g').$(firstword $(subst -, ,$(REVISION))) \ --encryption-block-size 0x20000 \ --openssl-bin "$(STAGING_DIR_HOST)/bin/openssl" \ --key 6865392d342b4d212964363d6d7e7765312c7132613364316e26322a5a5e2538 \