<div dir="ltr">Changes in V2:<div><br></div><div>1 Also drop the reference to image-vm.bbclass.</div><div><br></div><div>//Ming Liu</div></div><div class="gmail_extra"><br><div class="gmail_quote">2017-07-31 10:56 GMT+02:00 <span dir="ltr"><<a href="mailto:liu.ming50@gmail.com" target="_blank">liu.ming50@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">From: Ming Liu <<a href="mailto:peter.x.liu@external.atlascopco.com">peter.x.liu@external.<wbr>atlascopco.com</a>><br>
<br>
do_bootdirectdisk and do_vmimg had been dropped by commit 929ba563:<br>
[ image: Convert vmdk/vdi/qcow2 to strict CONVERSION_CMD types ]<br>
<br>
</span>Also drop the references to them and image-vm.<br>
<span class=""><br>
Signed-off-by: Ming Liu <<a href="mailto:peter.x.liu@external.atlascopco.com">peter.x.liu@external.<wbr>atlascopco.com</a>><br>
---<br>
meta/classes/grub-efi.bbclass | 1 -<br>
meta/classes/license.bbclass | 9 ++-------<br>
meta/classes/rm_work.bbclass | 2 +-<br>
</span> meta/classes/systemd-boot.<wbr>bbclass | 3 +--<br>
meta/conf/documentation.conf | 1 -<br>
5 files changed, 4 insertions(+), 12 deletions(-)<br>
<div><div class="h5"><br>
diff --git a/meta/classes/grub-efi.<wbr>bbclass b/meta/classes/grub-efi.<wbr>bbclass<br>
index df7fe18..610479b 100644<br>
--- a/meta/classes/grub-efi.<wbr>bbclass<br>
+++ b/meta/classes/grub-efi.<wbr>bbclass<br>
@@ -17,7 +17,6 @@<br>
# ${GRUB_ROOT} - grub's root device.<br>
<br>
do_bootimg[depends] += "${MLPREFIX}grub-efi:do_<wbr>deploy"<br>
-do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_<wbr>deploy"<br>
<br>
GRUB_SERIAL ?= "console=ttyS0,115200"<br>
GRUB_CFG_VM = "${S}/grub_vm.cfg"<br>
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass<br>
index d4be478..4f7842c 100644<br>
--- a/meta/classes/license.bbclass<br>
+++ b/meta/classes/license.bbclass<br>
@@ -255,14 +255,9 @@ def get_boot_dependencies(d):<br>
"""<br>
<br>
depends = []<br>
- boot_depends_string = ""<br>
taskdepdata = d.getVar("BB_TASKDEPDATA", False)<br>
- # Only bootimg and bootdirectdisk include the depends flag<br>
- boot_tasks = ["do_bootimg", "do_bootdirectdisk",]<br>
-<br>
- for task in boot_tasks:<br>
- boot_depends_string = "%s %s" % (boot_depends_string,<br>
- d.getVarFlag(task, "depends") or "")<br>
+ # Only bootimg includes the depends flag<br>
+ boot_depends_string = d.getVarFlag("do_bootimg", "depends") or ""<br>
boot_depends = [dep.split(":")[0] for dep<br>
in boot_depends_string.split()<br>
if not dep.split(":")[0].endswith("-<wbr>native")]<br>
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass<br>
index badeaeb..0faa4a6 100644<br>
--- a/meta/classes/rm_work.bbclass<br>
+++ b/meta/classes/rm_work.bbclass<br>
@@ -71,7 +71,7 @@ do_rm_work () {<br>
i=dummy<br>
break<br>
;;<br>
- *do_rootfs*|*do_image*|*do_<wbr>bootimg*|*do_bootdirectdisk*|*<wbr>do_vmimg*|*do_write_qemuboot_<wbr>conf*)<br>
+ *do_rootfs*|*do_image*|*do_<wbr>bootimg*|*do_write_qemuboot_<wbr>conf*)<br>
i=dummy<br>
break<br>
;;<br>
diff --git a/meta/classes/systemd-boot.<wbr>bbclass b/meta/classes/systemd-boot.<wbr>bbclass<br>
</div></div>index 9f8f75e..9373070 100644<br>
--- a/meta/classes/systemd-boot.<wbr>bbclass<br>
+++ b/meta/classes/systemd-boot.<wbr>bbclass<br>
@@ -7,10 +7,9 @@<br>
# maintenance.<br>
#<br>
# Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live images instead of grub-efi<br>
-# (images built by image-live.bbclass or image-vm.bbclass)<br>
+# (images built by image-live.bbclass)<br>
<div class="HOEnZb"><div class="h5"><br>
do_bootimg[depends] += "${MLPREFIX}systemd-boot:do_<wbr>deploy"<br>
-do_bootdirectdisk[depends] += "${MLPREFIX}systemd-boot:do_<wbr>deploy"<br>
<br>
EFIDIR = "/EFI/BOOT"<br>
<br>
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf<br>
index 35b9103..a55e283 100644<br>
--- a/meta/conf/documentation.conf<br>
+++ b/meta/conf/documentation.conf<br>
@@ -56,7 +56,6 @@ do_testsdk[doc] = "Installs an SDK and performs runtime tests on the tools insta<br>
do_uboot_mkimage[doc] = "Creates a uImage file from the kernel for the U-Boot bootloader"<br>
do_unpack[doc] = "Unpacks the source code into a working directory"<br>
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"<br>
-do_vmimg[doc] = "Creates an image for use with VMware or VirtualBox compatible virtual machine hosts (based on IMAGE_FSTYPES either .vmdk or .vdi)"<br>
<br>
# DESCRIPTIONS FOR VARIABLES #<br>
<br>
--<br>
2.7.4<br>
<br>
</div></div></blockquote></div><br></div>