build: Fix missing device variables for artifacts

It was reported to me today on IRC, that building of artifacts doesn't
work properly if the concat_cmd references DEVICE_NAME variable. I've
found out, that it's due to missing call of Device/Export in artifacts
building code path, so this patch adds the missing Device/Export call
which in turn exports DEFAULT_DEVICE_VARS into the artifacts
environment.

Fixes: 493c9a35516c ("build: Introduce building of artifacts")
Tested-by: Oskari Lemmela <[email protected]>
Reported-by: Oskari Lemmela <[email protected]>
Signed-off-by: Petr Štetiar <[email protected]>

diff --git a/include/image.mk b/include/image.mk
index 4307ead78be07ee8519020d689370ca929f6f3ec..4851a71bcd4a75c70e12b8a1bacabe5de9795b89 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -527,6 +527,7 @@ endef
 
 define Device/Build/artifact
   $$(_TARGET): $(BIN_DIR)/$(IMAGE_PREFIX)-$(1)
+  $(eval $(call Device/Export,$(KDIR)/tmp/$(IMAGE_PREFIX)-$(1)))
   $(KDIR)/tmp/$(IMAGE_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE)
        @rm -f $$@
        $$(call concat_cmd,$(ARTIFACT/$(1)))