Author: nbd
Date: 2015-08-13 21:35:26 +0200 (Thu, 13 Aug 2015)
New Revision: 46590

Modified:
   branches/chaos_calmer/include/image.mk
Log:
image: fix device variable exports for initramfs images

Signed-off-by: Felix Fietkau <[email protected]>

Backport of r46496

Modified: branches/chaos_calmer/include/image.mk
===================================================================
--- branches/chaos_calmer/include/image.mk      2015-08-13 19:02:26 UTC (rev 
46589)
+++ branches/chaos_calmer/include/image.mk      2015-08-13 19:35:26 UTC (rev 
46590)
@@ -364,6 +364,7 @@
 
 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 @@
 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 $$@
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to