From b7efe798c86ff6716c1ba1cec39d3532859c5a89 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 23 Jun 2006 22:46:07 +0000 Subject: [PATCH] prevent verbose script from corrupting .pkginfo SVN-Revision: 4067 --- openwrt/Makefile | 2 +- openwrt/include/verbose.mk | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/openwrt/Makefile b/openwrt/Makefile index a554a1d867..10652c07a3 100644 --- a/openwrt/Makefile +++ b/openwrt/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/openwrt/include/verbose.mk b/openwrt/include/verbose.mk index 1ef403ccfb..6d7c7ef6c1 100644 --- a/openwrt/include/verbose.mk +++ b/openwrt/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 -- 2.30.2