From 3620511fadd2b0faab085b5b616268f1e8ce5f1f Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Tue, 27 Oct 2020 15:55:35 +0000 Subject: xen: run do_deploy after do_compile and do_populate_sysroot When having rm_work and bitbake needs to re-run do_deploy, we need to ensure that the ${B} is re-generated, otherwise the deploy-xen will be empty. Signed-off-by: Diego Sueiro Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen-hypervisor.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-extended/xen/xen-hypervisor.inc b/recipes-extended/xen/xen-hypervisor.inc index 3bfee8ee..6a75d166 100644 --- a/recipes-extended/xen/xen-hypervisor.inc +++ b/recipes-extended/xen/xen-hypervisor.inc @@ -76,11 +76,13 @@ do_deploy() { # at least run afer that task has completed # - the hypervisor binaries may be included in the image filesystem, so we # must ensure that the binaries deployed match what is staged in the sysroot: -# so do deploy must run after do_populate_sysroot -- which is always after -# do_compile, so that handles 'after do_compile' too +# so do_deploy must run after do_populate_sysroot and after do_compile is +# also needed for when having rm_work and bitbake needs to re-run do_deploy, +# we ensure that the ${B} is re-generated, otherwise the deploy-xen will be +# empty # - add the task before do_build to ensure that deployment has completed when # the recipe build done stamp is written -addtask deploy after do_populate_sysroot before do_build +addtask deploy after do_compile do_populate_sysroot before do_build # To ensure that a deployed hypervisor has matching tools, add a dependency to # make sure that the tools have built and been staged: do_deploy[depends] += "xen-tools:do_populate_sysroot" -- cgit v1.2.3-54-g00ecf