[openwrt/openwrt] build: avoid generating JSON info on missing image

LEDE Commits lede-commits at lists.infradead.org
Wed May 26 15:29:22 PDT 2021


zorun pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/bb8fd58a23d202ce115813468e9119a631507f86

commit bb8fd58a23d202ce115813468e9119a631507f86
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Wed Feb 24 21:38:15 2021 +0100

    build: avoid generating JSON info on missing image
    
    Previously, build would fail for targets containing devices with not
    initramfs image (such as mpc85xx-p1010). Only generate the JSON image
    info for the initramfs image when we have one to avoid breaking the
    builds.
    
    Fixes commit d3140d052964 ("build/json: generate json file for initramfs")
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
    (cherry picked from commit 512229ce4967814a09ce202855e6b632d2e97a3c)
---
 include/image.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/image.mk b/include/image.mk
index e602f2f4e9..8cfd2155f3 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -472,8 +472,8 @@ endef
 ifndef IB
 define Device/Build/initramfs
   $(call Device/Export,$(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE),$(1))
-  $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)) \
-	  $$(if $$(CONFIG_JSON_OVERVIEW_IMAGE_INFO), $(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,)
+  $$(_TARGET): $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE) \
+	  $$(if $$(CONFIG_JSON_OVERVIEW_IMAGE_INFO), $(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,))
 
   $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare
   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)



More information about the lede-commits mailing list