[openwrt/openwrt] build: revert "make image target wait for initramfs"

LEDE Commits lede-commits at lists.infradead.org
Thu Mar 15 14:30:15 PDT 2018


mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/5862f01ef71e7ec75394e877e74e781b7d08a4d3

commit 5862f01ef71e7ec75394e877e74e781b7d08a4d3
Author: Christian Lamparter <chunkeey at gmail.com>
AuthorDate: Thu Mar 15 21:51:19 2018 +0100

    build: revert "make image target wait for initramfs"
    
    This reverts commit 43be5087a915727e7dcb3459e2221f094c70811b.
    
    The change is incompatible with the image builder code.
    Luckily the RT-AC58U is no longer depending on the initramfs
    being available for the target's image generation rules.
    
    Reported-by: Venitex Aveon <aveon at aenote.com>
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
 include/image.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/image.mk b/include/image.mk
index 64c224e..771f5b2 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -480,7 +480,7 @@ define Device/Build/image
   ifndef IB
     $$(ROOTFS/$(1)/$(3)): $(if $(TARGET_PER_DEVICE_ROOTFS),target-dir-$$(ROOTFS_ID/$(3)))
   endif
-  $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3)) $$(if $$(CONFIG_TARGET_ROOTFS_INITRAMFS),$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE))
+  $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3))
 	@rm -f $$@
 	[ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ]
 	$$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2))))



More information about the lede-commits mailing list