From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 13 Aug 2015 19:35:29 +0000 (+0000)
Subject: image: fix handling of per-device kernel build commands
X-Git-Tag: 15.05~27
X-Git-Url: https://git.archive.openwrt.org/?p=15.05%2Fopenwrt.git;a=commitdiff_plain;h=b7624961807fc47e01b6195b1ca60607b9f75ffc;ds=sidebyside

image: fix handling of per-device kernel build commands

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

Backport of r46589

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46591 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/image.mk b/include/image.mk
index 28cf36aaa0..a92b13e420 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -396,6 +396,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
@@ -411,7 +412,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 $$@