[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3018/8267] image_types.bbclass: add dependency do_image_wic -> do_bootimg

[Emmanuele Bassi <ebassi src gnome org>]

commit 65eb5144f5b4a3b642d349a292c89a8771799383
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Oct 12 14:47:16 2016 +0300

    image_types.bbclass: add dependency do_image_wic -> do_bootimg
    
    To produce certain types of images wic uses do_bootimg results
    to assemble final image. For example, it copies BOOT/EFI directory
    produced by do_bootimg to boot partition for every EFI image.
    
    The tricky part of this is that do_bootimg task is not always run,
    so we can't always make do_image_wic depend on do_bootimg. We only
    need to do it if do_bootimg present in task graph.
    
    Thank to Cristopher Larson for this fix.
    
    (From OE-Core rev: 1a961b4becf677c9eb07c5b24a8ddb75044663d1)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image_types.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5ef6f60..a7fffbc 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -219,6 +219,11 @@ USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s
 WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else 
''}"
 do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}"
 
+python () {
+    if d.getVar('USING_WIC', True) and 'do_bootimg' in d:
+        bb.build.addtask('do_image_wic', '', 'do_bootimg', d)
+}
+
 python do_write_wks_template () {
     """Write out expanded template contents to WKS_FULL_PATH."""
     import re