From 2e35d16e0322cd64bb0409515589dd44fe1d7b8d Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 15 Oct 2021 13:57:07 +0200 Subject: [PATCH] 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 --- meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb index d3d620517..d194a6314 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb @@ -93,8 +93,8 @@ do_configure_append() { # Only accept fragments ending in .cfg. If the fragments contain # something other than kernel configs, it will be filtered out # automatically. - if [ -f ${WORKDIR}/*.cfg ]; then - ${S}/scripts/kconfig/merge_config.sh -O ${B} ${B}/.config ${WORKDIR}/*.cfg + if [ -n "${@' '.join(find_cfgs(d))}" ]; then + ${S}/scripts/kconfig/merge_config.sh -m -O ${B} ${B}/.config ${@" ".join(find_cfgs(d))} fi }