[openwrt/openwrt] scan.mk: do not silence output of dump phase

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 13 05:11:44 PST 2023


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/9bac24e767611375a261a0ae9b0ec055eeec86dd

commit 9bac24e767611375a261a0ae9b0ec055eeec86dd
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu Jun 15 16:11:26 2023 +0200

    scan.mk: do not silence output of dump phase
    
    Make it easier to spot currently hidden issues:
    
     $ make defconfig V=sc
     ...
     Collecting target info: target/linux/airohabash: -c: line 1: syntax error near unexpected token `|'
     bash: -c: line 1: `echo 1686815253<LINUX_VERMAGIC> | staging_dir/host/bin/mkhash md5 | cut -b1-8'
     bash: -c: line 1: syntax error near unexpected token `|'
     bash: -c: line 1: `echo 1686815253<LINUX_VERMAGIC> | staging_dir/host/bin/mkhash md5 | sed -E 's/(.{8})(.{4})(.{4})(.{4})(.{10})../\1-\2-\3-\4-\500/''
     ...
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    (cherry picked from commit b522da5b16c7e5952d364b933b921786198f9fe5)
---
 include/scan.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/scan.mk b/include/scan.mk
index 5032afa818..73d2ff6e4f 100644
--- a/include/scan.mk
+++ b/include/scan.mk
@@ -49,7 +49,8 @@ define PackageDir
 		$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
 		echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
 		$(if $(3),echo Override: $(3),true); \
-		$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null || { \
+		$(if $(findstring c,$(OPENWRT_VERBOSE)),$(MAKE),$(NO_TRACE_MAKE) --no-print-dir) -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) \
+			$(if $(findstring c,$(OPENWRT_VERBOSE)),,2>/dev/null) || { \
 			mkdir -p "$(TOPDIR)/logs/$(SCAN_DIR)/$(2)"; \
 			$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) > $(TOPDIR)/logs/$(SCAN_DIR)/$(2)/dump.txt 2>&1; \
 			$$(call progress,ERROR: please fix $(SCAN_DIR)/$(2)/Makefile - see logs/$(SCAN_DIR)/$(2)/dump.txt for details\n) \




More information about the lede-commits mailing list