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

image: fix device variable exports for initramfs images
de041ddd · nbd · b62dde9c · de041ddd
Commit de041ddd 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
@@ -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 $$@