From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 13 Aug 2015 19:02:26 +0000 (+0000)
Subject: image: fix handling of per-device kernel build commands
X-Git-Tag: reboot~2307
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b25a12e8fa741e4a63b081be1111a3194b86bf4;p=openwrt%2Fstaging%2Fxback.git

image: fix handling of per-device kernel build commands

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 46589
---

diff --git a/include/image.mk b/include/image.mk
index 470a5dafeb..9dfce111a6 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -424,6 +424,7 @@ define Device/Build/kernel
   _KERNEL_IMAGES += $(KDIR)/$$(KERNEL_NAME)
   $(KDIR)/$$(KERNEL_NAME): image_prepare
   $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE))
+  $(call Device/Export,$(KDIR)/$$(KERNEL_IMAGE),$(1))
   $(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE)
 	cp $$^ $$@
   ifndef IB
@@ -439,7 +440,6 @@ endef
 
 define Device/Build/image
   $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))
-  $(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE),$(1)))
   $(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(1)))
   $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1)
 	@rm -f $$@