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.
Unified · Split
| @@ -56,9 +56,7 @@ if [ -f kernel/kheaders.md5 ] && · 55 unmodified lines | ||
| 56 | 56 | exit |
| 57 | 57 | fi |
| 58 | 58 | |
| 59 | −if [ "${quiet}" != "silent_" ]; then | |
| 60 | − echo " GEN $tarfile" | |
| 61 | −fi | |
| 59 | +echo " GEN $tarfile" | |
| 62 | 60 | |
| 63 | 61 | rm -rf $cpio_dir |
| 64 | 62 | mkdir $cpio_dir |
| @@ -38,9 +38,7 @@ LDFLAGS_vmlinux="$3" · 37 unmodified lines | ||
| 38 | 38 | # Will be supressed by "make -s" |
| 39 | 39 | info() |
| 40 | 40 | { |
| 41 | − if [ "${quiet}" != "silent_" ]; then | |
| 42 | − printf " %-7s %s\n" "${1}" "${2}" | |
| 43 | − fi | |
| 41 | + printf " %-7s %s\n" "${1}" "${2}" | |
| 44 | 42 | } |
| 45 | 43 | |
| 46 | 44 | # Generate a linker script to ensure correct ordering of initcalls. |
| @@ -9,8 +9,6 @@ PREEMPT_RT=$5 · 8 unmodified lines | ||
| 9 | 9 | CC_VERSION="$6" |
| 10 | 10 | LD=$7 |
| 11 | 11 | |
| 12 | −vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; } | |
| 13 | − | |
| 14 | 12 | # Do not expand names |
| 15 | 13 | set -f |
| 16 | 14 | |
| @@ -82,7 +80,7 @@ if [ -r $TARGET ] && \ · 65 unmodified lines | ||
| 82 | 80 | cmp -s .tmpver.1 .tmpver.2; then |
| 83 | 81 | rm -f .tmpcompile |
| 84 | 82 | else |
| 85 | − vecho " UPD $TARGET" | |
| 83 | + echo " UPD $TARGET" | |
| 86 | 84 | mv -f .tmpcompile $TARGET |
| 87 | 85 | fi |
| 88 | 86 | rm -f .tmpver.1 .tmpver.2 |