| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| 2 | Date: Mon, 26 Sep 2016 13:05:02 +0900 |
| 3 | Subject: [PATCH] check-config: allow to complete build even with ad-hoc CONFIG |
| 4 | options |
| 5 | |
| 6 | Currently, the check-config.sh terminates the build when unknown |
| 7 | ad-hoc options are detected. I think it is too much because we may |
| 8 | want to patch config headers locally in a build/deployment project. |
| 9 | |
| 10 | So, let's relax check-config.sh to just warn even if it detects |
| 11 | options that are not in the whitelist. Instead, this check can be |
| 12 | done at the end of build, along with other checks. It will catch |
| 13 | more attention. |
| 14 | |
| 15 | Even with this change, the Buildman tool catches new warnings, |
| 16 | so Tom can give NACK to new ad-hoc options. |
| 17 | |
| 18 | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| 19 | --- |
| 20 | scripts/check-config.sh | 3 +-- |
| 21 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 22 | |
| 23 | --- a/scripts/check-config.sh |
| 24 | +++ b/scripts/check-config.sh |
| 25 | @@ -50,14 +50,13 @@ cat `find ${srctree} -name "Kconfig*"` |sed -n \ |
| 26 | |sort |uniq > ${ok} |
| 27 | comm -23 ${suspects} ${ok} >${new_adhoc} |
| 28 | if [ -s ${new_adhoc} ]; then |
| 29 | - echo >&2 "Error: You must add new CONFIG options using Kconfig" |
| 30 | + echo >&2 "Warning: You must add new CONFIG options using Kconfig" |
| 31 | echo >&2 "The following new ad-hoc CONFIG options were detected:" |
| 32 | cat >&2 ${new_adhoc} |
| 33 | echo >&2 |
| 34 | echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig" |
| 35 | echo >&2 "file and add a 'config' or 'menuconfig' option." |
| 36 | # Don't delete the temporary files in case they are useful |
| 37 | - exit 1 |
| 38 | else |
| 39 | rm ${suspects} ${ok} ${new_adhoc} |
| 40 | fi |