summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2022-01-21 11:09:35 -0700
committerCommit Bot <commit-bot@chromium.org>2022-01-21 19:37:30 +0000
commite58883fa4e314bbf6c9f1d6ca7a88c7505df27fe (patch)
tree463d923919dcb5ba0f95c2512b14ae770f40e554
parent75affbe9e01c91c6886c222d874a7ddfc98b807e (diff)
downloadchrome-ec-e58883fa4e314bbf6c9f1d6ca7a88c7505df27fe.tar.gz
Require updates if ad-hoc configs have been converted
At present a 'Congratulations' message is printed but the build still succeeds. Change this so that people must run the update step to get a passing build. BUG=b:195718112 BRANCH=none TEST=add CONFIG_BATTERY to config_allowed.txt $ make BOARD=volteer -j30 See that an error is produced and the build fails Change-Id: I7675bd16b274612fb5e4088302ee5ea53ecd2a7b Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3406589 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
-rwxr-xr-xutil/build_allowed.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/build_allowed.sh b/util/build_allowed.sh
index 6ef4fe03a5..9aa769a726 100755
--- a/util/build_allowed.sh
+++ b/util/build_allowed.sh
@@ -63,14 +63,14 @@ if [ -r "${allowed}" ]; then
comm -13 "${tmp}/allowed.tmp4" "${allowed}"
mv "${tmp}/allowed.tmp4" "${allowed}"
elif [ -s "${tmp}/allowed.tmp5" ]; then
- echo >&2 "Congratulations! The following options are now in"
- echo >&2 "Kconfig:"
- cat "${tmp}/allowed.tmp5"
+ echo >&2 "The following options are now in Kconfig:"
+ cat >&2 "${tmp}/allowed.tmp5"
echo >&2
echo >&2 "Please run this to update the list of allowed ad-hoc"
- echo >&2 "CONFIGs and include this update in your CL."
+ echo >&2 "CONFIGs and include this update in your CL:"
echo >&2
echo -e >&2 "\t./util/build_allowed.sh -u"
+ exit 1
fi
else
# If there is no file yet, add one. This allows it to be regenerated