projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f4e312d
)
improve error message output of metadata scan - fix newline break and do not hide...
author
Felix Fietkau
<nbd@openwrt.org>
Wed, 27 May 2009 02:50:53 +0000
(
02:50
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Wed, 27 May 2009 02:50:53 +0000
(
02:50
+0000)
SVN-Revision: 16101
include/scan.mk
patch
|
blob
|
history
diff --git
a/include/scan.mk
b/include/scan.mk
index 1cf45e58b66d7889607809be41c6c750d4101e3f..288a10050bef7f5c0f076da9043ed1313cc470b0 100644
(file)
--- 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; \
{ \
$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
- $(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
; \
+ $(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null ||
{ $$(call progress,ERROR: please fix $(SCAN_DIR)/$(2)/Makefile\n) rm -f $$@; }
; \
echo; \
} > $$@ || true
endef
echo; \
} > $$@ || true
endef
@@
-62,7
+62,7
@@
$(TARGET_STAMP)::
$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
$(call progress,Collecting $(SCAN_NAME) info: merging...)
$(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP)
$(call progress,Collecting $(SCAN_NAME) info: merging...)
- cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@
+ -cat $(FILELIST) | awk '{gsub(/\//, "_", $$0);print "$(TMP_DIR)/info/.$(SCAN_TARGET)-" $$0}' | xargs cat > $@ 2>/dev/null
$(call progress,Collecting $(SCAN_NAME) info: done)
echo
$(call progress,Collecting $(SCAN_NAME) info: done)
echo