[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6746/8267] image_types_wic: set default WKS_FILE_DEPENDS

[Emmanuele Bassi <ebassi src gnome org>]

commit 393e55c1ff72558fddd2103fd8cc6d128df20b74
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Jul 14 15:33:05 2017 +0300

    image_types_wic: set default WKS_FILE_DEPENDS
    
    The default set of dependencies used via wic-tools is not used
    anymore as wic images don't depend on wic-tools.
    
    Set of packages required to produce wic image depends on the content
    of the .wks file, so WKS_FILE_DEPENDS variable should be used to
    provide correct list of dependencies when WKS_FILE variable is set.
    
    As WKS_FILE_DEPENDS is not used in many existing recipes yet we need
    to provide default value for it to ensure that removal of wic-tool
    dependency doesn't cause image build failures.
    
    Initialized WKS_FILE_DEPENDS with the set of dependencies previously
    brought by wic-tool. This is done to provide compatibility and to
    avoid breakages of existing image recipes that rely on current set
    of dependencies.
    
    Note: This is a temporary solution for transition period.
    After some time the list will be either reduced or removed.
    Recommended solution is to use WKS_FILE_DEPENDS in image recipes
    together with WKS_FILE to specify dependencies.
    
    (From OE-Core rev: 01fc31854f7da6b3a4546121f809875c35bbf0e0)
    
    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_wic.bbclass |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 4d85330..57ba646 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -40,7 +40,14 @@ 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}"
 do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r in ('parted', 'gptfdisk', 
'dosfstools', 'mtools'))}"
-WKS_FILE_DEPENDS ??= ''
+
+WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native 
squashfs-tools-native"
+WKS_FILE_DEPENDS_BOOTLOADERS = ""
+WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot"
+WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot"
+
+WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}"
+
 DEPENDS += "${@ '${WKS_FILE_DEPENDS}' if d.getVar('USING_WIC') else '' }"
 
 python do_write_wks_template () {