KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: make the color of the 'configuration out of sync' warning red to make it harder for users to overlook

Browse source 
SVN-Revision: 36082
This commit is contained in:
Felix Fietkau 2013-03-17 21:12:02 +00:00
parent 2167101c90
commit a4c8d4e377
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/toplevel.mk
View file

@ -9,6 +9,8 @@
RELEASE:=Barrier Breaker RELEASE:=Barrier Breaker
PREP_MK= OPENWRT_BUILD= QUIET=0 PREP_MK= OPENWRT_BUILD= QUIET=0
export IS_TTY=$(shell tty -s && echo 1 || echo 0)
include $(TOPDIR)/include/verbose.mk include $(TOPDIR)/include/verbose.mk
ifeq ($(SDK),1) ifeq ($(SDK),1)
@ -22,7 +24,6 @@ OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
export RELEASE export RELEASE
export REVISION export REVISION
export OPENWRTVERSION export OPENWRTVERSION
export IS_TTY=$(shell tty -s && echo 1 || echo 0)
export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib) export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
export GIT_CONFIG_PARAMETERS='core.autocrlf=false' export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
@ -148,7 +149,7 @@ prereq:: prepare-tmpinfo .config
cp .config tmp/.config; \ cp .config tmp/.config; \
./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \ ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \ if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!" >&2; \ printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \
fi \ fi \
) )
@+$(ULIMIT_FIX) $(SUBMAKE) -r $@ @+$(ULIMIT_FIX) $(SUBMAKE) -r $@

6
include/verbose.mk
View file

@ -27,6 +27,7 @@ endif
ifeq ($(IS_TTY),1) ifeq ($(IS_TTY),1)
ifneq ($(strip $(NO_COLOR)),1) ifneq ($(strip $(NO_COLOR)),1)
_Y:=\\033[33m _Y:=\\033[33m
_R:=\\033[31m
_N:=\\033[m _N:=\\033[m
endif endif
endif endif
@ -36,6 +37,10 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
printf "$(_Y)%s$(_N)\n" "$(1)" >&8 printf "$(_Y)%s$(_N)\n" "$(1)" >&8
endef endef
define ERROR_MESSAGE
printf "$(_R)%s$(_N)\n" "$(1)" >&8
endef
ifeq ($(QUIET),1) ifeq ($(QUIET),1)
ifneq ($(CURDIR),$(TOPDIR)) ifneq ($(CURDIR),$(TOPDIR))
_DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
@ -58,4 +63,5 @@ else
define MESSAGE define MESSAGE
printf "%s\n" "$(1)" printf "%s\n" "$(1)"
endef endef
ERROR_MESSAGE=$(MESSAGE)
endif endif