aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-07-26 11:42:27 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-07-26 11:42:27 +0000
commit6bb13be4f0309d6da0ed1d64d4b628468b93c3d5 (patch)
tree6c817846e20d72b469b0fb74d7a282bdd576a175 /include
parentaa16daf3bbc06df818497330674e1d2f026232b3 (diff)
downloadupstream-6bb13be4f0309d6da0ed1d64d4b628468b93c3d5.tar.gz
upstream-6bb13be4f0309d6da0ed1d64d4b628468b93c3d5.tar.bz2
upstream-6bb13be4f0309d6da0ed1d64d4b628468b93c3d5.zip
image: fix device variable exports for initramfs images
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 46496
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 a20e090fe7..470a5dafeb 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -392,6 +392,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
@@ -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/$(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 $$@