From: Siva Balasubramanian <[email protected]> do_write_qemuboot_conf had no dependency on the kernel deploy task, so if the kernel was rebuilt without invalidating the rootfs sstate, the task was skipped and .qemuboot.conf was left stale while new image artifacts were deployed with a new timestamp suffix.
Add do_write_qemuboot_conf[depends] on KERNEL_DEPLOY_DEPEND using a Python inline expression that skips the dependency when INITRAMFS_IMAGE_BUNDLE=1. When the initramfs is bundled into the kernel, linux-yocto:do_deploy depends on the initramfs image completing first, so an unconditional kernel deploy dependency on do_write_qemuboot_conf would create a circular dependency. KERNEL_DEPLOY_DEPEND is defined with ?= in image.bbclass and is already used by do_build[depends] for the same reason. Fixes: https://bugzilla.yoctoproject.org/show_bug.cgi?id=14520 Signed-off-by: Siva Balasubramanian <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Ross Burton <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit ed97056104ed2b97a687f956b49be7241862be53) Signed-off-by: Yoann Congal <[email protected]> --- meta/classes-recipe/qemuboot.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/qemuboot.bbclass b/meta/classes-recipe/qemuboot.bbclass index 56106b19581..d1794c7899d 100644 --- a/meta/classes-recipe/qemuboot.bbclass +++ b/meta/classes-recipe/qemuboot.bbclass @@ -128,6 +128,7 @@ inherit image-artifact-names # Create qemuboot.conf addtask do_write_qemuboot_conf after do_rootfs before do_image +do_write_qemuboot_conf[depends] += "${@ '' if bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')) else (d.getVar('KERNEL_DEPLOY_DEPEND') or '')}" def qemuboot_vars(d): build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE',
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240204): https://lists.openembedded.org/g/openembedded-core/message/240204 Mute This Topic: https://lists.openembedded.org/mt/120131957/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
