Fix setting a config with an already-existing conflicting value

Fix setting a config value in kconfig-inclusions when there's already a conflicting existing value in defconfig. For example, setting CONFIG_SYSTEM_TRUSTED_KEYS would have no effect, because there would already be a setting for this specified by Debian's default config. With this, it _might_ be possible to remove the need for kconfig-force-inclusions, but that still needs to be checked. Signed-off-by: Saikrishna Arcot <[email protected]>
DavidZagury · May 4, 2023 · 76b8795 · 76b8795
1 parent cc69246
commit 76b8795
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/manage-config b/manage-config
@@ -79,7 +79,9 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} -o -e ${force_inclusion_file}
         inclusion_opts=$(get_section_opts ${inclusion_file} "common" ${ARCH} ${PLATFORM})
         while read -r opt; do
             if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
-                echo $opt >> ${CONFIG_FILE}
+                n=${opt%=*}
+                v="${opt#*=}"
+                scripts/config --file ${CONFIG_FILE} -k --set-val "$n" "$v"
             fi
         done <<< ${inclusion_opts};
     fi