[gnome-continuous-yocto/gnomeostree-3.28-rocko: 99/218] image_types_wic.bbclass: Ensure '-c image_wic' works

[Emmanuele Bassi <ebassi src gnome org>]

commit 4aa750836262642d8d8a1a3bd175a0cae32b25ee
Author: Otavio Salvador <otavio ossystems com br>
Date:   Tue Jan 23 14:56:19 2018 -0200

    image_types_wic.bbclass: Ensure '-c image_wic' works
    
    The 'wic' image may use files which has been deployed (e.g in
    do_deploy) for some partitions that may need to be copied in a
    specific partition or filesystem (e.g a bootloader).
    
    When using 'bitbake <image> -c image_wic', from a clean build, the
    contents of do_deploy must also be available so we need to ensure all
    do_deploy of the image dependencies has been complete.
    
    Reported-by: Fabio Berton <fabio berton ossystems com br>
    (From OE-Core rev: 6c32803432cd847ae81767afcfbe4b5db41b9672)
    
    Signed-off-by: Otavio Salvador <otavio ossystems com br>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    (cherry picked from commit f387c28640cbb209b8a8ed5734b21c754d9f7663)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image_types_wic.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 222ae00..dcf620c 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -41,6 +41,9 @@ WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}
 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'))}"
 
+# We ensure all artfacts are deployed (e.g virtual/bootloader)
+do_image_wic[recrdeptask] += "do_deploy"
+
 WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native 
squashfs-tools-native e2fsprogs-native"
 WKS_FILE_DEPENDS_BOOTLOADERS = ""
 WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot"