From: Scott Rifenbark Date: Fri, 22 Sep 2017 15:31:50 +0000 (-0700) Subject: dev-manual, ref-manual: Image format implementation changes X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f94f6e655fc16213b0980c6f462785dc745dc445;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git dev-manual, ref-manual: Image format implementation changes Recently a number of changes have happened on the implementation side of some image formats, and a few have been renamed. The u-boot image signing code is now always available and no longer in a stand-alone file. The vmdk/mdi/qcow2 images have been removed and are now just a conversion type that is applied to wic images. Reported-by: Tom Rini (From yocto-docs rev: ce86da3d48507cee12208e0138c285b4be83d8cd) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- diff --git a/documentation/dev-manual/dev-manual-qemu.xml b/documentation/dev-manual/dev-manual-qemu.xml index d127c4f5108..89589291fde 100644 --- a/documentation/dev-manual/dev-manual-qemu.xml +++ b/documentation/dev-manual/dev-manual-qemu.xml @@ -165,14 +165,14 @@ - This example specifies to boot a virtual machine image - (.vmdk file). - From the .vmdk, + This example specifies to boot a virtual machine + image (.wic.vmdk file). + From the .wic.vmdk, runqemu determines the QEMU architecture (MACHINE) to be "qemux86" and the root filesystem type to be "vmdk". - $ runqemu /home/scott-lenovo/vm/core-image-minimal-qemux86.vmdk + $ runqemu /home/scott-lenovo/vm/core-image-minimal-qemux86.wic.vmdk diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml index 11605608e7e..f4905acd616 100644 --- a/documentation/ref-manual/migration.xml +++ b/documentation/ref-manual/migration.xml @@ -3000,8 +3000,7 @@ from autotools instead. boot-directdisk: - Merged into the - image-vm + Merged into the image-vm class. The boot-directdisk class was rarely directly used. diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml index 4dd67578c30..48468c7f895 100644 --- a/documentation/ref-manual/ref-classes.xml +++ b/documentation/ref-manual/ref-classes.xml @@ -1286,14 +1286,15 @@ image_types must also appear in IMAGE_CLASSES. - - -
- <filename>image_types_uboot.bbclass</filename> - The image_types_uboot class - defines additional image types specifically for the U-Boot bootloader. + This class also handles conversion and compression of images. + + To build a VMware VMDK image, you need to add "wic.vmdk" to + IMAGE_FSTYPES. + This would also be similar for Virtual Box Virtual Disk Image + ("vdi") and QEMU Copy On Write Version 2 ("qcow2") images. +
@@ -1370,27 +1371,6 @@ -
- <filename>image-vm.bbclass</filename> - - - The image-vm class supports building VM - images. - -
- -
- <filename>image-vmdk.bbclass</filename> - - - The image-vmdk class supports building VMware - VMDK images. - Normally, you do not use this class directly. - Instead, you add "vmdk" to - IMAGE_FSTYPES. - -
-
<filename>insane.bbclass</filename> diff --git a/documentation/ref-manual/ref-tasks.xml b/documentation/ref-manual/ref-tasks.xml index 10c67ab5299..2d23bbaabf9 100644 --- a/documentation/ref-manual/ref-tasks.xml +++ b/documentation/ref-manual/ref-tasks.xml @@ -842,16 +842,6 @@ section in the Yocto Project Development Manual.
- -
- <filename>do_vmdkimg</filename> - - - Creates a .vmdk image for use with - VMware - and compatible virtual machine hosts. - -
@@ -1274,9 +1274,9 @@ VM: The virtual machine image, which must be a - .vmdk file. + .wic.vmdk file. Use this option when you want to boot a - .vmdk image. + .wic.vmdk image. The image filename you provide must contain one of the following strings: "qemux86-64", "qemux86", "qemuarm", "qemumips64", "qemumips", "qemuppc", or "qemush4".