From: Petr Štetiar <ynezz@true.cz>
Date: Fri, 18 Jan 2019 08:25:59 +0000 (+0100)
Subject: build: Fix missing device variables for artifacts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bb23cb1bf2a32d1441720ae50bc354b8811b4bc7;p=openwrt%2Fstaging%2Fblocktrron.git

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 <oskari@lemmela.net>
Reported-by: Oskari Lemmela <oskari@lemmela.net>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/include/image.mk b/include/image.mk
index 4307ead78b..4851a71bcd 100644
--- 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)))