X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fscan.mk;h=1cf45e58b66d7889607809be41c6c750d4101e3f;hb=276e135328377c4be73243007df2350193d374d3;hp=c51c4c7adf2fa64e7b463c802a23c137606aba3d;hpb=b6d28f87f4a1d651498265f083f1e0f92d2450c7;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/include/scan.mk b/include/scan.mk index c51c4c7adf..1cf45e58b6 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -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; \