From: Quentin Schulz <[email protected]> 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 <[email protected]> Cc: Quentin Schulz <[email protected]> Signed-off-by: Quentin Schulz <[email protected]> --- Tested by running: MACHINE=qemuarm devtool modify u-boot MACHINE=qemuarm devtool build u-boot [modify configs/qemu_arm_defconfig] MACHINE=qemuarm devtool build u-boot MACHINE=qemuarm bitbake-diffsigs -t u-boot compile [Checksum for file oe-devtool-tree-sha1-u-boot changed] Apply the patch, then run: MACHINE=qemuarm devtool build u-boot [modify configs/qemu_arm_defconfig] MACHINE=qemuarm devtool build u-boot MACHINE=qemuarm bitbake-diffsigs -t u-boot compile [Hash for task dependency u-boot:do_configure changed Checksum for file qemu_arm_defconfig changed] --- meta/recipes-bsp/u-boot/u-boot-configure.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-bsp/u-boot/u-boot-configure.inc b/meta/recipes-bsp/u-boot/u-boot-configure.inc index 235623d25a..378d675364 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 --- base-commit: 94f99434eff15a92cfdc2dce423d32a1b74aab39 change-id: 20240321-u-boot-defconfig-devtool-905683a1bedc Best regards, -- Quentin Schulz <[email protected]>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#197422): https://lists.openembedded.org/g/openembedded-core/message/197422 Mute This Topic: https://lists.openembedded.org/mt/105069918/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
