aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-08-13 19:35:26 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-08-13 19:35:26 +0000
commit2bab87c90c677db1dd256f14f4f115fbc51db19e (patch)
treedc8a433c49c31149e9baa05eedc88bd6079ebc28 /include
parent11e562d28c4deeb69f009484f3e3b055666c32be (diff)
downloadupstream-2bab87c90c677db1dd256f14f4f115fbc51db19e.tar.gz
upstream-2bab87c90c677db1dd256f14f4f115fbc51db19e.tar.bz2
upstream-2bab87c90c677db1dd256f14f4f115fbc51db19e.zip
image: fix device variable exports for initramfs images
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r46496 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46590 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 020418d54d..28cf36aaa0 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -364,6 +364,7 @@ endef
ifndef IB
define Device/Build/initramfs
+ $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
$$(_TARGET): $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
$(KDIR)/$$(KERNEL_NAME)-initramfs: image_prepare
@@ -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/$(KERNEL_INITRAMFS_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 $$@