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

image: fix handling of per-device kernel build commands
b7624961 · nbd · de041ddd · b7624961
Commit b7624961 authored Aug 13, 2015 by nbd
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

image.mk include/image.mk +1 -1

No files found.
--- 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 $$@