From: mbm Date: Fri, 23 Jun 2006 22:46:07 +0000 (+0000) Subject: prevent verbose script from corrupting .pkginfo X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=594722a4093c9ea95a8718591971d67a0bd7565d prevent verbose script from corrupting .pkginfo git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4067 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/Makefile b/Makefile index a554a1d86..10652c07a 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo) @echo Collecting package info... @-for dir in package/*/; do \ 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 > $@ endif diff --git a/include/verbose.mk b/include/verbose.mk index 1ef403ccf..6d7c7ef6c 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -2,17 +2,12 @@ # $Id:$ ifndef KBUILD_VERBOSE - ifeq ($(DUMP),) - KBUILD_VERBOSE=0 - else - KBUILD_VERBOSE=99 - endif + KBUILD_VERBOSE=0 ifeq ("$(origin V)", "command line") KBUILD_VERBOSE=$(V) endif endif - ifneq ($(KBUILD_VERBOSE),99) ifeq ($(QUIET),1) $(MAKECMDGOALS): trace @@ -23,6 +18,7 @@ ifneq ($(KBUILD_VERBOSE),99) } else export QUIET:=1 + NO_TRACE_MAKE:=$(MAKE) V=99 ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif