[OE-core] [PATCH] image.bbclass: fix EXTRA_IMAGEDEPENDS dependencies

[liu.ming50 at gmail.com]

From: Ming Liu <ming.liu at toradex.com>

Sometimes the deploy tasks of EXTRA_IMAGEDEPENDS are also needed by
image, for instance, in qemuriscv64/qemuriscv machines:
- EXTRA_IMAGEDEPENDS += "u-boot"
- EXTRA_IMAGEDEPENDS += "opensbi"

and there are also a lot of similar usuages in some BSP layers like
meta-freescale.

So we change to let image's do_image_complete depend on do_build task
of EXTRA_IMAGEDEPENDS recipes, to be able to depend on do_deploy task
as well as do_populate_sysroot task.

Signed-off-by: Ming Liu <ming.liu at toradex.com>
---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 682858d..89ec2b4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -144,7 +144,7 @@ python () {
             deps += " %s:%s" % (dep, task)
         return deps
 
-    d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot'))
+    d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends(d.getVar('RM_WORK_BUILD_WITHOUT') or 'do_build'))
 
     deps = " " + imagetypes_getdepends(d)
     d.appendVarFlag('do_rootfs', 'depends', deps)
-- 
2.7.4