[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8165/8267] image.bbclass: let do_image depend on do_populate_lic of EXTRA_IMAGEDEPENDS

[Emmanuele Bassi <ebassi src gnome org>]

commit 18941419c8ca01735e237f9ae96db260bd958ce2
Author: Ming Liu <liu ming50 gmail com>
Date:   Tue Sep 26 14:31:16 2017 +0200

    image.bbclass: let do_image depend on do_populate_lic of EXTRA_IMAGEDEPENDS
    
    The licenses of EXTRA_IMAGEDEPENDS recipes are being referenced in
    image postcommand write_deploy_manifest, but a dependency is missing
    between do_image and do_populate_lic of EXTRA_IMAGEDEPENDS recipes,
    this leads some license files not present when write_deploy_manifest
    runs, hence will cause build errors.
    
    Fixed by letting do_image depend on do_populate_lic of
    EXTRA_IMAGEDEPENDS recipes.
    
    (From OE-Core rev: 2aa357501f74163f49c62db8660b7a132b5d0d46)
    
    Signed-off-by: Ming Liu <liu ming50 gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 20240ba..d93de02 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -145,14 +145,18 @@ IMAGE_TYPE_wic = "image_types_wic"
 inherit ${IMAGE_TYPE_wic}
 
 python () {
+    def extraimage_getdepends(task):
+        deps = ""
+        for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split():
+            deps += " %s:%s" % (dep, task)
+        return deps
+
+    d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_lic'))
+    d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot'))
+
     deps = " " + imagetypes_getdepends(d)
     d.appendVarFlag('do_rootfs', 'depends', deps)
 
-    deps = ""
-    for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split():
-        deps += " %s:do_populate_sysroot" % dep
-    d.appendVarFlag('do_image_complete', 'depends', deps)
-
     #process IMAGE_FEATURES, we must do this before runtime_mapping_rename
     #Check for replaces image features
     features = set(oe.data.typed_value('IMAGE_FEATURES', d))