niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

scripts: merge_config: Add option to suppress warning on overrides

Browse source 
Currently merge_config.sh will unconditionally warn if a fragment overrides
any already set symbol. This is generally desirable but is inconvenient in
cases where we want to create a fragment which disables unwanted options in
the base configuration, for example when attempting to produce a smaller
version of another configuration.

Add an option -Q which will suppress these warnings.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230203-arm64-defconfigs-v1-1-cd0694a05f13@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Mark Brown 2023-02-10 19:52:47 +00:00 • committed by Arnd Bergmann
parent 384fcb0bd1
commit 46dff8d7e3
No known key found for this signature in database
GPG key ID: 9A6C79EFE60018D9
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
scripts/kconfig/merge_config.sh
View file

@ -29,6 +29,7 @@ usage() {
echo " -y make builtin have precedence over modules" echo " -y make builtin have precedence over modules"
echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead." echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
echo " -s strict mode. Fail if the fragment redefines any value." echo " -s strict mode. Fail if the fragment redefines any value."
echo " -Q disable warning messages for overridden options."
echo echo
echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable." echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
} }
@ -40,6 +41,7 @@ BUILTIN=false
OUTPUT=. OUTPUT=.
STRICT=false STRICT=false
CONFIG_PREFIX=${CONFIG_-CONFIG_} CONFIG_PREFIX=${CONFIG_-CONFIG_}
WARNOVERRIDE=echo
while true; do while true; do
case $1 in case $1 in
@ -82,6 +84,11 @@ while true; do
shift shift
continue continue
;; ;;
"-Q")
WARNOVERRIDE=true
shift
continue
;;
*) *)
break break
;; ;;
@ -138,21 +145,21 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
NEW_VAL=$(grep -w $CFG $MERGE_FILE) NEW_VAL=$(grep -w $CFG $MERGE_FILE)
BUILTIN_FLAG=false BUILTIN_FLAG=false
if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
echo Previous value: $PREV_VAL ${WARNOVVERIDE} Previous value: $PREV_VAL
echo New value: $NEW_VAL ${WARNOVERRIDE} New value: $NEW_VAL
echo -y passed, will not demote y to m ${WARNOVERRIDE} -y passed, will not demote y to m
echo ${WARNOVERRIDE}
BUILTIN_FLAG=true BUILTIN_FLAG=true
elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
echo Value of $CFG is redefined by fragment $ORIG_MERGE_FILE: ${WARNOVERRIDE} Value of $CFG is redefined by fragment $ORIG_MERGE_FILE:
echo Previous value: $PREV_VAL ${WARNOVERRIDE} Previous value: $PREV_VAL
echo New value: $NEW_VAL ${WARNOVERRIDE} New value: $NEW_VAL
echo ${WARNOVERRIDE}
if [ "$STRICT" = "true" ]; then if [ "$STRICT" = "true" ]; then
STRICT_MODE_VIOLATED=true STRICT_MODE_VIOLATED=true
fi fi
elif [ "$WARNREDUN" = "true" ]; then elif [ "$WARNREDUN" = "true" ]; then
echo Value of $CFG is redundant by fragment $ORIG_MERGE_FILE: ${WARNOVERRIDE} Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
fi fi
if [ "$BUILTIN_FLAG" = "false" ]; then if [ "$BUILTIN_FLAG" = "false" ]; then
sed -i "/$CFG[ =]/d" $TMP_FILE sed -i "/$CFG[ =]/d" $TMP_FILE