[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5214/8267] image_types_wic.bbclass: tighten dependency to help do_rm_work_all

[Emmanuele Bassi <ebassi src gnome org>]

commit e4b5771409bf86fa0b0e5d72151be2b42aeac89c
Author: Patrick Ohly <patrick ohly intel com>
Date:   Fri Mar 17 18:56:59 2017 +0100

    image_types_wic.bbclass: tighten dependency to help do_rm_work_all
    
    Depending on wic-tools:do_build pulls a lot of additional, indirect
    dependencies into the image sysroot during do_image_wic as soon as
    rm_work.bbclass is active, because then we have
    do_build->do_rm_work_all->[all dependencies]. One of those
    dependencies is libgcc-initial, which clashes with libgcc itself,
    leading to errors in extend_recipe_sysroot like this:
    
       Exception: FileExistsError: [Errno 17] File exists: 
'.../tmp/sysroots-components/corei7-64/glibc-initial/usr/include/fstab.h' -> 
'.../tmp/work/intel_corei7_64-poky-linux/core-image-minimal/1.0-r0/recipe-sysroot/usr/include/fstab.h'
    
    As the image recipe only needs the sysroot of wic-tools and does not
    need to wait for the build of wic-tools to finish, depending on
    do_populate_sysroot is the better choice and happens to avoid
    the problem above.
    
    (From OE-Core rev: a678f54e710e46b3cf674ffa41d6432b22effbdf)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image_types_wic.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 500c8c5..4711c24 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -39,7 +39,7 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES"
 USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in 
'${CONVERSIONTYPES}'.split()), '1', '', d)}"
 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}"
-do_image_wic[depends] += "wic-tools:do_build"
+do_image_wic[depends] += "wic-tools:do_populate_sysroot"
 WKS_FILE_DEPENDS ??= ''
 DEPENDS += "${@ '${WKS_FILE_DEPENDS}' if d.getVar('USING_WIC') else '' }"