linux-dey: fix apply of kernel configuration fragments

- Add the '-m' parameter. Without it, the script doesn't
  generate the output merged configuration file, and the
  fragments are not applied.
- Fix the if condition. The '*.cfg' expands to a list of
  files, but the '-f' only admits one parameter. Use instead
  the Python find_cfgs() function.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2021-10-15 13:57:07 +02:00
parent 9ac3bd46ca
commit 2e35d16e03
1 changed files with 2 additions and 2 deletions

View File

@ -93,8 +93,8 @@ do_configure_append() {
# Only accept fragments ending in .cfg. If the fragments contain # Only accept fragments ending in .cfg. If the fragments contain
# something other than kernel configs, it will be filtered out # something other than kernel configs, it will be filtered out
# automatically. # automatically.
if [ -f ${WORKDIR}/*.cfg ]; then if [ -n "${@' '.join(find_cfgs(d))}" ]; then
${S}/scripts/kconfig/merge_config.sh -O ${B} ${B}/.config ${WORKDIR}/*.cfg ${S}/scripts/kconfig/merge_config.sh -m -O ${B} ${B}/.config ${@" ".join(find_cfgs(d))}
fi fi
} }