aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-08-13 19:35:29 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-08-13 19:35:29 +0000
commit17c7a62e81b5b5fe421ac4540f05eebff4dcb64b (patch)
tree1760e963d74f7928c3db1144dfa80cb443b30ec8 /include
parent2bab87c90c677db1dd256f14f4f115fbc51db19e (diff)
downloadupstream-17c7a62e81b5b5fe421ac4540f05eebff4dcb64b.tar.gz
upstream-17c7a62e81b5b5fe421ac4540f05eebff4dcb64b.tar.bz2
upstream-17c7a62e81b5b5fe421ac4540f05eebff4dcb64b.zip
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
Diffstat (limited to 'include')
-rw-r--r--include/image.mk2
1 files changed, 1 insertions, 1 deletions
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 $$@