Skip to contentSkip to conversation

scripts: merge_config: Add flag to prevent unsetting config option

PATCH In review Rahul Rameshbabu 2 participants 6 messages Jul 29, 2023 – Aug 16, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts: merge_config: Add flag to prevent unsetting config option

Overriding a previously defined entry for a config option with 'is not set' may be undesirable in some fragment configuration setups. Provide a flag to change the behavior, so 'is not set' is not overridden when a previous value for the same config option already exists.

---
 scripts/kconfig/merge_config.sh | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)
scripts/kconfig/merge_config.sh +18 -4
index 902eb429b9db..bbe235f2df70 100755
@@ -30,6 +30,7 @@ usage() {
 	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 "  -Q    disable warning messages for overridden options."
+	echo "  -N    not set entries in fragments will not override options."
 	echo
 	echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
 }
@@ -42,6 +43,7 @@ OUTPUT=.
 STRICT=false
 CONFIG_PREFIX=${CONFIG_-CONFIG_}
 WARNOVERRIDE=echo
+OVERRIDENOTSET=true
 
 while true; do
 	case $1 in
@@ -89,6 +91,11 @@ while true; do
 		shift
 		continue
 		;;
+	"-N")
+		OVERRIDENOTSET=false
+		shift
+		continue
+		;;
 	*)
 		break
 		;;
@@ -143,13 +150,20 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
 		grep -q -w $CFG $TMP_FILE || continue
 		PREV_VAL=$(grep -w $CFG $TMP_FILE)
 		NEW_VAL=$(grep -w $CFG $MERGE_FILE)
-		BUILTIN_FLAG=false
-		if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
+		NO_OVERRIDE_FLAG=false
+		if [ "$OVERRIDENOTSET" = "false" ] && [ "${NEW_VAL#\# CONFIG_* }" = "is not set" ] &&
+			   [ "$PREV_VAL" != "" ] && [ "${PREV_VAL#\# CONFIG_* }" != "is not set" ]; then
+			${WARNOVERRIDE} Previous  value: $PREV_VAL
+			${WARNOVERRIDE} New value:       $NEW_VAL
+			${WARNOVERRIDE} -N passed, will not unset option
+			${WARNOVERRIDE}
+			NO_OVERRIDE_FLAG=true
+		elif [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
 			${WARNOVERRIDE} Previous  value: $PREV_VAL
 			${WARNOVERRIDE} New value:       $NEW_VAL
 			${WARNOVERRIDE} -y passed, will not demote y to m
 			${WARNOVERRIDE}
-			BUILTIN_FLAG=true
+			NO_OVERRIDE_FLAG=true
 		elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
 			${WARNOVERRIDE} Value of $CFG is redefined by fragment $ORIG_MERGE_FILE:
 			${WARNOVERRIDE} Previous  value: $PREV_VAL
@@ -161,7 +175,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
 		elif [ "$WARNREDUN" = "true" ]; then
 			${WARNOVERRIDE} Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
 		fi
-		if [ "$BUILTIN_FLAG" = "false" ]; then
+		if [ "$NO_OVERRIDE_FLAG" = "false" ]; then
 			sed -i "/$CFG[ =]/d" $TMP_FILE
 		else
 			sed -i "/$CFG[ =]/d" $MERGE_FILE
Signature · 1 line
2.40.1
#1 lore raw
Quoted 3 lines · Rahul Rameshbabu

Overriding a previously defined entry for a config option with 'is not set' may be undesirable in some fragment configuration setups.

Then, you should remove the 'is not set' entry from the fragment.

Signature · 2 lines
Best Regards
Masahiro Yamada
#2 lore raw
Quoted 7 lines · On Sun, 06 Aug, 2023 23:19:55 +0900 "Masahiro Yamada" <[email protected]>…
Quoted 3 lines · Rahul Rameshbabu

Overriding a previously defined entry for a config option with 'is not set' may be undesirable in some fragment configuration setups.

Then, you should remove the 'is not set' entry from the fragment.

I had a feeling that was the expectation. Just for reference, my flow for generating fragments looks like the following.

1. make allnoconfig
2. make menuconfig # select the options that I desire for the fragment

We can drop this patch if this is the expected developer flow. I realized that overriding with 'is not set' entries in a fragment is likely desirable, so I made this behavior change as part of a flag that can be set by the user.

--
Thanks,

Rahul Rameshbabu

#3 lore raw
Quoted 9 lines · Rahul Rameshbabu
Quoted 6 lines · On Sun, 06 Aug, 2023 23:19:55 +0900 "Masahiro Yamada" <[email protected]>…
Quoted 3 lines · Rahul Rameshbabu

Overriding a previously defined entry for a config option with 'is not set' may be undesirable in some fragment configuration setups.

Quoted 7 lines
Quoted 1 line

Then, you should remove the 'is not set' entry from the fragment.

I had a feeling that was the expectation. Just for reference, my flow for generating fragments looks like the following.

1. make allnoconfig
2. make menuconfig # select the options that I desire for the fragment

Sorry, I could not understand
how these steps generate a fragment file.

You will get a full .config file
after 'make menuconfig'.

Quoted 10 lines

We can drop this patch if this is the expected developer flow. I realized that overriding with 'is not set' entries in a fragment is likely desirable, so I made this behavior change as part of a flag that can be set by the user.

--
Thanks,

Rahul Rameshbabu

Signature · 2 lines
Best Regards
Masahiro Yamada
#4 lore raw
Quoted 20 lines · On Tue, 08 Aug, 2023 04:04:37 +0900 "Masahiro Yamada" <[email protected]>…
Quoted 9 lines · Rahul Rameshbabu
Quoted 6 lines · On Sun, 06 Aug, 2023 23:19:55 +0900 "Masahiro Yamada" <[email protected]>…
Quoted 3 lines · Rahul Rameshbabu

Overriding a previously defined entry for a config option with 'is not set' may be undesirable in some fragment configuration setups.

Quoted 7 lines
Quoted 1 line

Then, you should remove the 'is not set' entry from the fragment.

I had a feeling that was the expectation. Just for reference, my flow for generating fragments looks like the following.

1. make allnoconfig
2. make menuconfig # select the options that I desire for the fragment

Quoted 5 lines

Sorry, I could not understand
how these steps generate a fragment file.

You will get a full .config file
after 'make menuconfig'.

Yep, this is right. I am not really generating a fragment this way but rather full configs with minimal options that I end up wanting to merge together. What's your process for generating fragments you need? Just dumping the options you want in fragment files and letting make properly select the dependencies?

Quoted 10 lines
Quoted 10 lines

We can drop this patch if this is the expected developer flow. I realized that overriding with 'is not set' entries in a fragment is likely desirable, so I made this behavior change as part of a flag that can be set by the user.

Quoted 5 lines
Quoted 5 lines

--
Thanks,

Rahul Rameshbabu

--
Thanks,

Rahul Rameshbabu

#5 lore raw
Quoted 26 lines · Rahul Rameshbabu
Quoted 23 lines · On Tue, 08 Aug, 2023 04:04:37 +0900 "Masahiro Yamada" <[email protected]>…
Quoted 9 lines · Rahul Rameshbabu
Quoted 6 lines · On Sun, 06 Aug, 2023 23:19:55 +0900 "Masahiro Yamada" <[email protected]>…
Quoted 3 lines · Rahul Rameshbabu

Overriding a previously defined entry for a config option with 'is not set' may be undesirable in some fragment configuration setups.

Quoted 7 lines
Quoted 1 line

Then, you should remove the 'is not set' entry from the fragment.

I had a feeling that was the expectation. Just for reference, my flow for generating fragments looks like the following.

1. make allnoconfig
2. make menuconfig # select the options that I desire for the fragment

Sorry, I could not understand
how these steps generate a fragment file.

Quoted 8 lines
Quoted 2 lines

You will get a full .config file
after 'make menuconfig'.

Yep, this is right. I am not really generating a fragment this way but rather full configs with minimal options that I end up wanting to merge together. What's your process for generating fragments you need? Just dumping the options you want in fragment files and letting make properly select the dependencies?

I would manually write a fragment file.

I see comment lines in

kernel/configs/debug.config
kernel/configs/xen.config

I believe they were written by hand.

Signature · 2 lines
Best Regards
Masahiro Yamada