summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongjin Kim <tobetter@gmail.com>2020-05-19 12:52:03 +0300
committerDongjin Kim <tobetter@gmail.com>2020-05-19 13:07:55 +0300
commit00f3878d307314c9363b20a8ba3d34e411d266bc (patch)
tree3428e3b4611b40ed0b71a928dde6f6a9a89db275
parenta917f39c3ac26607fa9f249fc997617722b6411f (diff)
downloadu-boot-00f3878d307314c9363b20a8ba3d34e411d266bc.tar.xz
BACKPORT: check-config: allow to complete build even with ad-hoc CONFIG
Currently, the check-config.sh terminates the build when unknown ad-hoc options are detected. I think it is too much because we may want to patch config headers locally in a build/deployment project. So, let's relax check-config.sh to just warn even if it detects options that are not in the whitelist. Instead, this check can be done at the end of build, along with other checks. It will catch more attention. Even with this change, the Buildman tool catches new warnings, so Tom can give NACK to new ad-hoc options. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Dongjin Kim <tobetter@gmail.com> Change-Id: I0c068de48a58b65b8bdec7579ee10042f9c48dc4
-rwxr-xr-xscripts/check-config.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/check-config.sh b/scripts/check-config.sh
index 97e52dce83..f117e4bfe9 100755
--- a/scripts/check-config.sh
+++ b/scripts/check-config.sh
@@ -37,14 +37,13 @@ cat `find ${srctree} -name "Kconfig*"` |sed -n \
-e '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 "Warning: 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