From: Paul Spooren Date: Tue, 13 Aug 2019 21:38:17 +0000 (-1000) Subject: imagebuilder: fix `make info` for empty SUPPORTED_DEVICES X-Git-Tag: v19.07.0-rc1~326 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8bf8de95a20d9fee54bbd579832c578c62cbc901;p=oweals%2Fopenwrt.git imagebuilder: fix `make info` for empty SUPPORTED_DEVICES For x86/64 (maybe more) target the SUPPORTED_DEVICES variable is empty which causes the `&&` junction to fail, producing a non zero exit code. Tested-by: Paul Spooren Fixed-by: Jo-Philipp Wich Signed-off-by: Paul Spooren (cherry picked from commit 07926d7def59e5684b488e9b614342edc19e7eb2) --- diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 22b2731358..15b3d5c35c 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -76,7 +76,8 @@ USER_PROFILE ?= $(firstword $(PROFILE_NAMES)) PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ echo '$(patsubst DEVICE_%,%,$(p)):'; $(if $($(p)_NAME),echo ' $(subst ','"'"',$($(p)_NAME))'; ) \ echo ' Packages: $($(p)_PACKAGES)'; echo ' hasImageMetadata: $($(p)_HAS_IMAGE_METADATA)'; \ - [ "$($(p)_SUPPORTED_DEVICES)" ] && echo ' SupportedDevices: $($(p)_SUPPORTED_DEVICES)'; ) + $(if $($(p)_SUPPORTED_DEVICES),echo ' SupportedDevices: $($(p)_SUPPORTED_DEVICES)';) ) + .profiles.mk: .targetinfo @$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@