From: Quentin Schulz Date: Thu, 21 Mar 2024 17:17:07 +0000 (+0100) Subject: u-boot: fix externalsrc not triggering do_configure on defconfig changes X-Git-Tag: yocto-5.2~3308 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fef517b5f978cf848b9cc40e8ce6bb2762681182;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git u-boot: fix externalsrc not triggering do_configure on defconfig changes externalsrc only monitors files listed in CONFIGURE_FILES environment variable to know if it should trigger a rebuild of do_configure. By default it is unset, but the defconfig from U-Boot should be listed otherwise an old defconfig may be used even though the change is technically detected by the do_compile logic later in the process. Because U-Boot recipe uses `make oldconfig` when no defconfig is passed, monitor .config for that special case. This fixes U-Boot recipes not detecting defconfig changes when devtool'ed. Reported-by: Iskander Amara Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-bsp/u-boot/u-boot-configure.inc b/meta/recipes-bsp/u-boot/u-boot-configure.inc index 235623d25a7..378d6753646 100644 --- a/meta/recipes-bsp/u-boot/u-boot-configure.inc +++ b/meta/recipes-bsp/u-boot/u-boot-configure.inc @@ -8,6 +8,8 @@ inherit uboot-config cml1 DEPENDS += "kern-tools-native" +CONFIGURE_FILES = "${@d.getVar('UBOOT_MACHINE') or '.config'}" + do_configure () { if [ -n "${UBOOT_CONFIG}" ]; then unset i j