Commit fd54f502841c1caa7cfd5af564aad1bd017371fa
Committed by
Sam Ravnborg
1 parent
5410ecc0de
Exists in
master
and in
7 other branches
kbuild: use KECHO convenience echo
Convert a few echos in the build system to new $(kecho) so we get correct output according to build verbosity. Signed-off-by: Mike Frysinger <vapier@gentoo.org> [sam: added kecho in a few more places for O=... builds] Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Showing 3 changed files with 7 additions and 14 deletions Side-by-side Diff
Makefile
... | ... | @@ -926,7 +926,7 @@ |
926 | 926 | # 2) Create the include2 directory, used for the second asm symlink |
927 | 927 | prepare3: include/config/kernel.release |
928 | 928 | ifneq ($(KBUILD_SRC),) |
929 | - @echo ' Using $(srctree) as source for kernel' | |
929 | + @$(kecho) ' Using $(srctree) as source for kernel' | |
930 | 930 | $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \ |
931 | 931 | echo " $(srctree) is not clean, please run 'make mrproper'";\ |
932 | 932 | echo " in the '$(srctree)' directory.";\ |
... | ... | @@ -983,7 +983,7 @@ |
983 | 983 | # directory for generated filesas used by some architectures. |
984 | 984 | define create-symlink |
985 | 985 | if [ ! -L include/asm ]; then \ |
986 | - echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ | |
986 | + $(kecho) ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ | |
987 | 987 | if [ ! -d include/asm-$(SRCARCH) ]; then \ |
988 | 988 | mkdir -p include/asm-$(SRCARCH); \ |
989 | 989 | fi; \ |
... | ... | @@ -1096,7 +1096,7 @@ |
1096 | 1096 | PHONY += modules |
1097 | 1097 | modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) |
1098 | 1098 | $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order |
1099 | - @echo ' Building modules, stage 2.'; | |
1099 | + @$(kecho) ' Building modules, stage 2.'; | |
1100 | 1100 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
1101 | 1101 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild |
1102 | 1102 | |
... | ... | @@ -1360,7 +1360,7 @@ |
1360 | 1360 | $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) |
1361 | 1361 | |
1362 | 1362 | modules: $(module-dirs) |
1363 | - @echo ' Building modules, stage 2.'; | |
1363 | + @$(kecho) ' Building modules, stage 2.'; | |
1364 | 1364 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
1365 | 1365 | |
1366 | 1366 | PHONY += modules_install |
arch/blackfin/boot/Makefile
scripts/Kbuild.include
... | ... | @@ -46,22 +46,15 @@ |
46 | 46 | # - If they are equal no change, and no timestamp update |
47 | 47 | # - stdin is piped in from the first prerequisite ($<) so one has |
48 | 48 | # to specify a valid file as first prerequisite (often the kbuild file) |
49 | - chk_filechk = : | |
50 | - quiet_chk_filechk = echo ' CHK $@' | |
51 | -silent_chk_filechk = : | |
52 | - upd_filechk = : | |
53 | - quiet_upd_filechk = echo ' UPD $@' | |
54 | -silent_upd_filechk = : | |
55 | - | |
56 | 49 | define filechk |
57 | 50 | $(Q)set -e; \ |
58 | - $($(quiet)chk_filechk); \ | |
51 | + $(kecho) ' CHK $@'; \ | |
59 | 52 | mkdir -p $(dir $@); \ |
60 | 53 | $(filechk_$(1)) < $< > $@.tmp; \ |
61 | 54 | if [ -r $@ ] && cmp -s $@ $@.tmp; then \ |
62 | 55 | rm -f $@.tmp; \ |
63 | 56 | else \ |
64 | - $($(quiet)upd_filechk); \ | |
57 | + $(kecho) ' UPD $@'; \ | |
65 | 58 | mv -f $@.tmp $@; \ |
66 | 59 | fi |
67 | 60 | endef |