X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7a694d4e5f8054d5c4b05fbed69fb1a38f387e29..d0c10785e702f0e56029aee4c4f8f9bfcf03a5e9:/include/scan.mk diff --git a/include/scan.mk b/include/scan.mk index 3d97a4f5c..1cf45e58b 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -17,7 +17,7 @@ ifeq ($(IS_TTY),1) endef else define progress - : + :; endef endif @@ -27,7 +27,7 @@ define PackageDir { \ $$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \ echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \ - $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(2)/Makefile" >&2; \ + $(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null || echo "ERROR: please fix $(SCAN_DIR)/$(2)/Makefile" >&2; \ echo; \ } > $$@ || true endef @@ -50,9 +50,9 @@ $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST) -include $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk $(TARGET_STAMP):: - ( \ + +( \ $(NO_TRACE_MAKE) $(FILELIST); \ - MD5SUM=$$(cat $(FILELIST) | (md5sum || md5) | awk '{print $$1}'); \ + MD5SUM=$$(cat $(FILELIST) | (md5sum || md5) 2>/dev/null | awk '{print $$1}'); \ [ -f "$@.$$MD5SUM" ] || { \ rm -f $@.*; \ touch $@.$$MD5SUM; \