prevent verbose script from corrupting .pkginfo
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4067 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
2feb2b9d8d
commit
951735a1fe
2
Makefile
2
Makefile
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue