Skip to content

Commit e9206c9

Browse files
committed
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]>
1 parent 34f26b3 commit e9206c9

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

manage-config

+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} -o -e ${force_inclusion_file}
7979
inclusion_opts=$(get_section_opts ${inclusion_file} "common" ${ARCH} ${PLATFORM})
8080
while read -r opt; do
8181
if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
82-
echo $opt >> ${CONFIG_FILE}
82+
n=${opt%=*}
83+
v="${opt#*=}"
84+
scripts/config --file ${CONFIG_FILE} -k --set-val "$n" "$v"
8385
fi
8486
done <<< ${inclusion_opts};
8587
fi

0 commit comments

Comments
 (0)