[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7066/8267] meta: drop do_bootdirectdisk do_vmimg references

[Emmanuele Bassi <ebassi src gnome org>]

commit 7a25294b714a183ff18d1a95a0f8a8208ce51865
Author: Ming Liu <peter x liu external atlascopco com>
Date:   Mon Jul 31 10:56:28 2017 +0200

    meta: drop do_bootdirectdisk do_vmimg references
    
    do_bootdirectdisk and do_vmimg had been dropped by commit 929ba563:
    [ image: Convert vmdk/vdi/qcow2 to strict CONVERSION_CMD types ]
    
    Also drop the references to them and image-vm.
    
    (From OE-Core rev: 609f7f4ecd17c8299b97d9face098e3cc44fa6eb)
    
    Signed-off-by: Ming Liu <peter x liu external atlascopco com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/grub-efi.bbclass     |    1 -
 meta/classes/license.bbclass      |    9 ++-------
 meta/classes/rm_work.bbclass      |    2 +-
 meta/classes/systemd-boot.bbclass |    3 +--
 meta/conf/documentation.conf      |    1 -
 5 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index df7fe18..610479b 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -17,7 +17,6 @@
 # ${GRUB_ROOT} - grub's root device.
 
 do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy"
-do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_deploy"
 
 GRUB_SERIAL ?= "console=ttyS0,115200"
 GRUB_CFG_VM = "${S}/grub_vm.cfg"
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index d4be478..4f7842c 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -255,14 +255,9 @@ def get_boot_dependencies(d):
     """
 
     depends = []
-    boot_depends_string = ""
     taskdepdata = d.getVar("BB_TASKDEPDATA", False)
-    # Only bootimg and bootdirectdisk include the depends flag
-    boot_tasks = ["do_bootimg", "do_bootdirectdisk",]
-
-    for task in boot_tasks:
-        boot_depends_string = "%s %s" % (boot_depends_string,
-                d.getVarFlag(task, "depends") or "")
+    # Only bootimg includes the depends flag
+    boot_depends_string = d.getVarFlag("do_bootimg", "depends") or ""
     boot_depends = [dep.split(":")[0] for dep
                 in boot_depends_string.split()
                 if not dep.split(":")[0].endswith("-native")]
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 71c21a0..3d7fb52 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -66,7 +66,7 @@ do_rm_work () {
                 i=dummy
                 break
                 ;;
-            *do_rootfs*|*do_image*|*do_bootimg*|*do_bootdirectdisk*|*do_vmimg*|*do_write_qemuboot_conf*)
+            *do_rootfs*|*do_image*|*do_bootimg*|*do_write_qemuboot_conf*)
                 i=dummy
                 break
                 ;;
diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass
index 9f8f75e..9373070 100644
--- a/meta/classes/systemd-boot.bbclass
+++ b/meta/classes/systemd-boot.bbclass
@@ -7,10 +7,9 @@
 #                        maintenance.
 #
 # Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live images instead of grub-efi
-# (images built by image-live.bbclass or image-vm.bbclass)
+# (images built by image-live.bbclass)
 
 do_bootimg[depends] += "${MLPREFIX}systemd-boot:do_deploy"
-do_bootdirectdisk[depends] += "${MLPREFIX}systemd-boot:do_deploy"
 
 EFIDIR = "/EFI/BOOT"
 
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 35b9103..a55e283 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -56,7 +56,6 @@ do_testsdk[doc] = "Installs an SDK and performs runtime tests on the tools insta
 do_uboot_mkimage[doc] = "Creates a uImage file from the kernel for the U-Boot bootloader"
 do_unpack[doc] = "Unpacks the source code into a working directory"
 do_validate_branches[doc] = "Ensures that the source/meta branches are on the locations specified by their 
SRCREV values for a linux-yocto style kernel"
-do_vmimg[doc] = "Creates an image for use with VMware or VirtualBox compatible virtual machine hosts (based 
on IMAGE_FSTYPES either .vmdk or .vdi)"
 
 # DESCRIPTIONS FOR VARIABLES #