diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-04-26 17:53:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-04-26 17:53:56 +0000 |
| commit | 34ffb526a27dc3f1bf16cd6cdebbfa08c40a6d7a (patch) | |
| tree | 8868b74560909f5524164014dc7e890be4d6f65d /include | |
| parent | d7b7b99d6e9195e0e563d14336628b533b0fcd29 (diff) | |
| download | upstream-34ffb526a27dc3f1bf16cd6cdebbfa08c40a6d7a.tar.gz upstream-34ffb526a27dc3f1bf16cd6cdebbfa08c40a6d7a.tar.bz2 upstream-34ffb526a27dc3f1bf16cd6cdebbfa08c40a6d7a.zip | |
build: rework verbosity level selection
V=99 and V=1 are now deprecated in favor of a new verbosity class system,
though the old flags are still supported.
You can set the V variable on the command line (or OPENWRT_VERBOSE in the
environment) to one or more of the following characters:
- s: stdout+stderr (equal to the old V=99)
- c: commands (for build systems that suppress commands by default, e.g. kbuild)
- w: warnings/errors only (equal to the old V=1)
SVN-Revision: 31484
Diffstat (limited to 'include')
| -rw-r--r-- | include/kernel-defaults.mk | 7 | ||||
| -rw-r--r-- | include/verbose.mk | 31 |
2 files changed, 19 insertions, 19 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 6864793a27..0c188502fc 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -9,7 +9,8 @@ KERNEL_MAKEOPTS := -C $(LINUX_DIR) \ CROSS_COMPILE="$(KERNEL_CROSS)" \ ARCH="$(LINUX_KARCH)" \ KBUILD_HAVE_NLS=no \ - CONFIG_SHELL="$(BASH)" + CONFIG_SHELL="$(BASH)" \ + $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1) ifdef CONFIG_STRIP_KERNEL_EXPORTS KERNEL_MAKEOPTS += \ @@ -22,10 +23,6 @@ ifneq (,$(KERNEL_CC)) KERNEL_MAKEOPTS += CC="$(KERNEL_CC)" endif -ifeq ($(KBUILD_VERBOSE),99) - KERNEL_MAKEOPTS += V=1 -endif - export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include # defined in quilt.mk diff --git a/include/verbose.mk b/include/verbose.mk index 9fe27ced52..e17b1264d8 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -5,16 +5,23 @@ # See /LICENSE for more information. # -ifeq ($(NO_TRACE_MAKE),) -NO_TRACE_MAKE := $(MAKE) V=99 -export NO_TRACE_MAKE +ifndef OPENWRT_VERBOSE + OPENWRT_VERBOSE:= +endif +ifeq ("$(origin V)", "command line") + OPENWRT_VERBOSE:=$(V) endif -ifndef KBUILD_VERBOSE - KBUILD_VERBOSE:=0 +ifeq ($(OPENWRT_VERBOSE),1) + OPENWRT_VERBOSE:=w endif -ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE:=$(V) +ifeq ($(OPENWRT_VERBOSE),99) + OPENWRT_VERBOSE:=s +endif + +ifeq ($(NO_TRACE_MAKE),) +NO_TRACE_MAKE := $(MAKE) V=$(subst w,s,$(OPENWRT_VERBOSE)) +export NO_TRACE_MAKE endif ifeq ($(IS_TTY),1) @@ -24,7 +31,7 @@ ifeq ($(IS_TTY),1) endif endif -ifneq ($(KBUILD_VERBOSE),99) +ifeq ($(findstring s,$(OPENWRT_VERBOSE)),) define MESSAGE printf "$(_Y)%s$(_N)\n" "$(1)" >&8 endef @@ -40,13 +47,9 @@ ifneq ($(KBUILD_VERBOSE),99) )) SUBMAKE=$(MAKE) else - ifeq ($(KBUILD_VERBOSE),0) - SILENT:=>/dev/null 2>&1 - else - SILENT:= - endif + SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1) export QUIET:=1 - SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=99 to see what's going on"; false; } } 8>&1 9>&2; cmd + SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=s to see what's going on"; false; } } 8>&1 9>&2; cmd endif .SILENT: $(MAKECMDGOALS) |