Merge pull request #515 from chengguosun/bug-fix

Fixed configure script bug.
This commit is contained in:
Devin Matthews
2021-07-05 21:35:07 -05:00
committed by GitHub

23
configure vendored
View File

@@ -775,7 +775,8 @@ read_registry_file()
# canonicalize whitespace, and then remove duplicate kernel # canonicalize whitespace, and then remove duplicate kernel
# set names, if they exist. Finally, update the kernel registry # set names, if they exist. Finally, update the kernel registry
# with the new kernel list. # with the new kernel list.
newklist=$(echo -e "${klisttmp}" | sed -e "s/${ker}/${kers_ker}/g") #newklist=$(echo -e "${klisttmp}" | sed -e "s/${ker}/${kers_ker}/g")
newklist=$(substitute_words "${ker}" "${kers_ker}" "${klisttmp}")
newklist=$(canonicalize_ws "${newklist}") newklist=$(canonicalize_ws "${newklist}")
newklist=$(rm_duplicate_words "${newklist}") newklist=$(rm_duplicate_words "${newklist}")
@@ -797,6 +798,26 @@ read_registry_file()
done done
} }
substitute_words()
{
local word new_words list newlist
word="$1"
new_words="$2"
list="$3"
for str in ${list}; do
if [ "${str}" == "${word}" ]; then
newlist="${newlist} ${new_words}"
else
newlist="${newlist} ${str}"
fi
done
echo "${newlist}"
}
build_kconfig_registry() build_kconfig_registry()
{ {
local familyname clist config kernels kernel cur_configs newvalue local familyname clist config kernels kernel cur_configs newvalue