kbuild: clean up ${quiet} checks in shell scripts

There were efforts to make 'make -s' really silent when it is a warning-free build. The conventional way was to let a shell script check ${quiet}, and if it is 'silent_', suppress the stdout by itself. With the previous commit, the 'cmd' takes care of it now. The 'cmd' is also invoked from if_changed, if_changed_dep, and if_changed_rule. You can omit ${quiet} checks in shell scripts when they are invoked from the 'cmd' macro.

Masahiro Yamada committed 5 years ago

Commit c39013e1 parent 174a1dc3 files · +3 −9Browse files

Unified · Split

3 files

kernel/gen_kheaders.sh +1 −3
scripts/link-vmlinux.sh +1 −3
scripts/mkcompile_h +1 −3

kernel/gen_kheaders.sh+1−3

@@ -56,9 +56,7 @@ if [ -f kernel/kheaders.md5 ] && · 55 unmodified lines
56	exit	56	exit
57	fi	57	fi
58		58
59	if [ "${quiet}" != "silent_" ]; then	59	echo " GEN $tarfile"
60	echo " GEN $tarfile"
61	fi
62		60
63	rm -rf $cpio_dir	61	rm -rf $cpio_dir
64	mkdir $cpio_dir	62	mkdir $cpio_dir

scripts/link-vmlinux.sh+1−3

 # Will be supressed by "make -s"
 info()
 {
-	if [ "${quiet}" != "silent_" ]; then
+	printf "  %-7s %s\n" "${1}" "${2}"
-		printf "  %-7s %s\n" "${1}" "${2}"
-	fi
 }
 # Generate a linker script to ensure correct ordering of initcalls.

scripts/mkcompile_h+1−3

 CC_VERSION="$6"
 LD=$7
-vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
 # Do not expand names
 set -f
       cmp -s .tmpver.1 .tmpver.2; then
    rm -f .tmpcompile
 else
-   vecho "  UPD     $TARGET"
+   echo "  UPD     $TARGET"
    mv -f .tmpcompile $TARGET
 fi
 rm -f .tmpver.1 .tmpver.2