[CRIU] [PATCH 2/3] Makefile.config: don't silent twice

Kir Kolyshkin kolyshkin at gmail.com
Wed Jan 23 23:02:20 MSK 2019


Here $(Q) is substituted with either @ or nothing, depending on
whether V is set, to either have verbose output or not. So, it does
not make sense to add another @.

Signed-off-by: Kir Kolyshkin <kolyshkin at gmail.com>
---
 Makefile.config | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index d89ccbb1a..a853705b3 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -44,24 +44,24 @@ FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
 # $1 - config name
 define gen-feature-test
 ifeq ($$(call try-cc,$$(FEATURE_TEST_$(1)),$$(LIBS_FEATURES),$$(DEFINES)),true)
-	$(Q) @echo '#define CONFIG_HAS_$(1)' >> $$@
-	$(Q) @echo '' >> $$@
+	$(Q) echo '#define CONFIG_HAS_$(1)' >> $$@
+	$(Q) echo '' >> $$@
 endif
 endef
 
 define config-header-rule
 $(CONFIG_HEADER): scripts/feature-tests.mak $(CONFIG_FILE)
-	$$(call msg-gen, $$@)
-	$(Q) @echo '#ifndef __CR_CONFIG_H__'				> $$@
-	$(Q) @echo '#define __CR_CONFIG_H__'				>> $$@
-	$(Q) @echo ''							>> $$@
+	$(call msg-gen, $$@)
+	$(Q) echo '#ifndef __CR_CONFIG_H__'				> $$@
+	$(Q) echo '#define __CR_CONFIG_H__'				>> $$@
+	$(Q) echo ''							>> $$@
 $(call map,gen-feature-test,$(FEATURES_LIST))
-	$(Q) @cat $(CONFIG_FILE) | sed -n -e '/^[^#]/s/^/#define CONFIG_/p' >> $$@
+	$(Q) cat $(CONFIG_FILE) | sed -n -e '/^[^#]/s/^/#define CONFIG_/p' >> $$@
 ifeq ($$(VDSO),y)
-	$(Q) @echo '#define CONFIG_VDSO'				>> $$@
-	$(Q) @echo ''							>> $$@
+	$(Q) echo '#define CONFIG_VDSO'				>> $$@
+	$(Q) echo ''							>> $$@
 endif
-	$(Q) @echo '#endif /* __CR_CONFIG_H__ */'			>> $$@
+	$(Q) echo '#endif /* __CR_CONFIG_H__ */'			>> $$@
 endef
 
 $(eval $(config-header-rule))
-- 
2.17.1



More information about the CRIU mailing list