prevent verbose script from corrupting .pkginfo

SVN-Revision: 4067
master
Mike Baker 19 years ago
parent 53349e67e3
commit b7efe798c8
  1. 2
      openwrt/Makefile
  2. 8
      openwrt/include/verbose.mk

@ -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

@ -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

Loading…
Cancel
Save