[meta-virtualization] [PATCH] qemuboot-xen-dtb: Fix task dependency

[meta-virtualization] [PATCH] qemuboot-xen-dtb: Fix task dependency

[Richard Purdie]

qemuboot in OE-Core had a bug fixed here:
https://git.openembedded.org/openembedded-core/commit/?id=8e2a45871962c9e44b2ae04dc1f09ee8d634170f
where it was running before IMGDEPLOYDIR was cleaned and hence the files
were getting lost. It was moved to run between do_image and do_image_complete
which is the correct place to run things touching IMGDEPLOYDIR.

This code also touches IMGDEPLOYDIR so it needs to run before do_image_complete
for the same reasons. This fixes a build failure after the above merged:

"""
These are usually caused by circular dependencies and any circular dependency chains found will be printed below. Increase the debug level to see a list of unbuildable tasks.

Identifying dependency loops (this may take a short while)...

ERROR:
Dependency loop #1 found:
  Task /srv/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/images/xen-image-minimal.bb:do_image (dependent Tasks ['xen-image-minimal.bb:do_create_rootfs_spdx', 'xen-image-minimal.bb:do_image_qa', 'xen-image-minimal.bb:do_flush_pseudodb', 'xen-image-minimal.bb:do_write_xen_qemuboot_dtb', 'xen-image-minimal.bb:do_rootfs'])
  Task /srv/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/images/xen-image-minimal.bb:do_write_qemuboot_conf (dependent Tasks ['xen-image-minimal.bb:do_image', 'linux-yocto_6.18.bb:do_deploy'])
  Task /srv/pokybuild/yocto-worker/meta-virt/build/meta-virtualization/recipes-extended/images/xen-image-minimal.bb:do_write_xen_qemuboot_dtb (dependent Tasks ['xen-image-minimal.bb:do_write_qemuboot_conf'])
"""

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 classes/qemuboot-xen-dtb.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/qemuboot-xen-dtb.bbclass b/classes/qemuboot-xen-dtb.bbclass
index d43d23a3..c2a7f013 100644
--- a/classes/qemuboot-xen-dtb.bbclass
+++ b/classes/qemuboot-xen-dtb.bbclass
@@ -182,7 +182,7 @@ do_write_xen_qemuboot_dtb() {
     fi
 }
 
-addtask do_write_xen_qemuboot_dtb after do_write_qemuboot_conf before do_image
+addtask do_write_xen_qemuboot_dtb after do_write_qemuboot_conf before do_image_complete
 # Task dependency:
 # An expected common case is that the kernel for at least one of the initial
 # domains (eg. dom0) is deployed from the virtual/kernel recipe, so

Re: [meta-virtualization] [PATCH] qemuboot-xen-dtb: Fix task dependency

[Bruce Ashfield]

merged

Bruce