X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fscan.mk;h=1cf45e58b66d7889607809be41c6c750d4101e3f;hb=4f88f8de81407f05b9eddd550d0b201296d75886;hp=28f526aa335ed94b5c18a21efb2640d98f2c030f;hpb=f8dfc5757363cfcfda561ecde2ee75d9a0e5d16f;p=openwrt%2Fopenwrt.git diff --git a/include/scan.mk b/include/scan.mk index 28f526aa33..1cf45e58b6 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 @@ -49,10 +49,10 @@ $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk: $(FILELIST) -include $(TMP_DIR)/info/.files-$(SCAN_TARGET).mk -$(TARGET_STAMP): - ( \ +$(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; \