From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 13 Aug 2015 19:35:26 +0000 (+0000)
Subject: image: fix device variable exports for initramfs images
X-Git-Tag: 15.05~28
X-Git-Url: https://git.archive.openwrt.org/?p=15.05%2Fopenwrt.git;a=commitdiff_plain;h=de041ddd38b94daab24e3fa6ebdcd8b69e0ba567;ds=inline

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
---

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 $$@