Skip to content

Commit

Permalink
kbuild: clean up ${quiet} checks in shell scripts
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
  • Loading branch information
Masahiro Yamada committed May 26, 2021
1 parent 174a1dc commit c39013e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
4 changes: 1 addition & 3 deletions kernel/gen_kheaders.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ if [ -f kernel/kheaders.md5 ] &&
exit
fi

if [ "${quiet}" != "silent_" ]; then
echo " GEN $tarfile"
fi
echo " GEN $tarfile"

rm -rf $cpio_dir
mkdir $cpio_dir
Expand Down
4 changes: 1 addition & 3 deletions scripts/link-vmlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ LDFLAGS_vmlinux="$3"
# Will be supressed by "make -s"
info()
{
if [ "${quiet}" != "silent_" ]; then
printf " %-7s %s\n" "${1}" "${2}"
fi
printf " %-7s %s\n" "${1}" "${2}"
}

# Generate a linker script to ensure correct ordering of initcalls.
Expand Down
4 changes: 1 addition & 3 deletions scripts/mkcompile_h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ PREEMPT_RT=$5
CC_VERSION="$6"
LD=$7

vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }

# Do not expand names
set -f

Expand Down Expand Up @@ -82,7 +80,7 @@ if [ -r $TARGET ] && \
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

0 comments on commit c39013e

Please sign in to comment.