KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prevent verbose script from corrupting .pkginfo

Browse source 
SVN-Revision: 4067
This commit is contained in:
Mike Baker 2006-06-23 22:46:07 +00:00
parent 53349e67e3
commit b7efe798c8
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openwrt/Makefile
View file

@ -46,7 +46,7 @@ ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo)
@echo Collecting package info... @echo Collecting package info...
@-for dir in package/*/; do \ @-for dir in package/*/; do \
echo Source-Makefile: $${dir}Makefile; \ echo Source-Makefile: $${dir}Makefile; \
$(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ $(NO_TRACE_MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \
done > $@ done > $@
endif endif

8
openwrt/include/verbose.mk
View file

@ -2,17 +2,12 @@
# $Id:$ # $Id:$
ifndef KBUILD_VERBOSE ifndef KBUILD_VERBOSE
ifeq ($(DUMP),) KBUILD_VERBOSE=0
KBUILD_VERBOSE=0
else
KBUILD_VERBOSE=99
endif
ifeq ("$(origin V)", "command line") ifeq ("$(origin V)", "command line")
KBUILD_VERBOSE=$(V) KBUILD_VERBOSE=$(V)
endif endif
endif endif
ifneq ($(KBUILD_VERBOSE),99) ifneq ($(KBUILD_VERBOSE),99)
ifeq ($(QUIET),1) ifeq ($(QUIET),1)
$(MAKECMDGOALS): trace $(MAKECMDGOALS): trace
@ -23,6 +18,7 @@ ifneq ($(KBUILD_VERBOSE),99)
} }
else else
export QUIET:=1 export QUIET:=1
NO_TRACE_MAKE:=$(MAKE) V=99
ifeq ($(KBUILD_VERBOSE),0) ifeq ($(KBUILD_VERBOSE),0)
MAKE:=&>/dev/null $(MAKE) MAKE:=&>/dev/null $(MAKE)
endif endif