mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 00:47:26 +00:00
f69dce5081
scripts/check-config.sh exits successfully and silently without doing
any checks when the 'comm' command is not found.
The problem triggers from the command around line 39:
comm -23 ${suspects} ${ok} >${new_adhoc}
This statement fails when 'comm' is not in $PATH, creating an empty
${new_adhoc} file. But the script continues and the following line,
which is supposed to detect an error:
if [ -s ${new_adhoc} ]; then
will always be false since the file is empty, and the script will exit
successfully as if everything were OK.
The case where 'comm' in not in $PATH is not theoretical. It used to
happen on yocto until a recent fix [0], and still happens on the
current stable branch (rocko).
Fix by setting the errexit flag to exit with error when a statement
fails, so that at least the problem is noticed.
For additional safety also set the nounset flag to detect expansion
errors.
[0] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=fe0b4cb5b48580d4a3f3c0eb82bfa6f1b13801e4
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
54 lines
1.5 KiB
Bash
Executable file
54 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
# Copyright (c) 2016 Google, Inc
|
|
# Written by Simon Glass <sjg@chromium.org>
|
|
#
|
|
# Check that the u-boot.cfg file provided does not introduce any new
|
|
# ad-hoc CONFIG options
|
|
#
|
|
# Use scripts/build-whitelist.sh to generate the list of current ad-hoc
|
|
# CONFIG options (those which are not in Kconfig).
|
|
|
|
# Usage
|
|
# check-config.sh <path to u-boot.cfg> <path to whitelist file> <source dir>
|
|
#
|
|
# For example:
|
|
# scripts/check-config.sh b/chromebook_link/u-boot.cfg kconfig_whitelist.txt .
|
|
|
|
set -e
|
|
set -u
|
|
|
|
path="$1"
|
|
whitelist="$2"
|
|
srctree="$3"
|
|
|
|
# Temporary files
|
|
configs="${path}.configs"
|
|
suspects="${path}.suspects"
|
|
ok="${path}.ok"
|
|
new_adhoc="${path}.adhoc"
|
|
|
|
export LC_ALL=C
|
|
export LC_COLLATE=C
|
|
|
|
cat ${path} |sed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort |uniq \
|
|
>${configs}
|
|
|
|
comm -23 ${configs} ${whitelist} > ${suspects}
|
|
|
|
cat `find ${srctree} -name "Kconfig*"` |sed -n \
|
|
-e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
|
|
-e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
|
|
|sort |uniq > ${ok}
|
|
comm -23 ${suspects} ${ok} >${new_adhoc}
|
|
if [ -s ${new_adhoc} ]; then
|
|
echo >&2 "Error: You must add new CONFIG options using Kconfig"
|
|
echo >&2 "The following new ad-hoc CONFIG options were detected:"
|
|
cat >&2 ${new_adhoc}
|
|
echo >&2
|
|
echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig"
|
|
echo >&2 "file and add a 'config' or 'menuconfig' option."
|
|
# Don't delete the temporary files in case they are useful
|
|
exit 1
|
|
else
|
|
rm ${suspects} ${ok} ${new_adhoc}
|
|
fi
|