diff options
| author |   Patrick Ohly <patrick.ohly@intel.com> | 2015-09-24 16:53:10 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 11:58:22 +0100 |
| commit | e3ff509091cbbfdef851f8a3c9e31c7b76d37e89 (patch) | |
| tree | 09d9085c7d7c72832c4afee4eab2240ef33ff73a /meta | |
| parent | 55e8067d3fb6a1fc97b4486e28e3e3bae2b5cd00 (diff) | |
| download | openembedded-core-contrib-e3ff509091cbbfdef851f8a3c9e31c7b76d37e89.tar.gz | |
image types: add hdddirect
When image-vm.bbclass was introduced, it indirectly also introduced a
".hdddirect" image type based on boot-directdisk.bbclass. However, one
could only get that image when also enabling at least one of the
virtual machine images.
The .hdddirect images are useful by themselves. By registering
image-vm.bbclass as implementation of it, it becomes possible to
select them with:
IMAGE_FSTYPES = "hdddirect"
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image-vm.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image_types.bbclass | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 0632667084..5ddd1cb274 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass @@ -18,7 +18,8 @@ inherit boot-directdisk IMAGE_TYPEDEP_vmdk = "ext4" IMAGE_TYPEDEP_vdi = "ext4" IMAGE_TYPEDEP_qcow2 = "ext4" -IMAGE_TYPES_MASKED += "vmdk vdi qcow2" +IMAGE_TYPEDEP_hdddirect = "ext4" +IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect" create_vmdk_image () { qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 86a98bb11d..7e6822cac5 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -150,7 +150,7 @@ def build_live(d): IMAGE_TYPE_live = "${@build_live(d)}" inherit ${IMAGE_TYPE_live} -IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2"], "image-vm", "", d)}' +IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2", "hdddirect"], "image-vm", "", d)}' inherit ${IMAGE_TYPE_vm} python () { diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index afa2e8eb8f..50369197c5 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -13,7 +13,7 @@ def imagetypes_getdepends(d): deps = [] ctypes = d.getVar('COMPRESSIONTYPES', True).split() for type in (d.getVar('IMAGE_FSTYPES', True) or "").split(): - if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]: + if type in ["vmdk", "vdi", "qcow2", "hdddirect", "live", "iso", "hddimg"]: type = "ext4" basetype = type for ctype in ctypes: @@ -227,6 +227,7 @@ IMAGE_TYPES = " \ vmdk \ vdi \ qcow2 \ + hdddirect \ elf \ wic wic.gz wic.bz2 wic.lzma \ " @@ -254,7 +255,7 @@ DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" IMAGE_EXTENSION_live = "hddimg iso" # The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, -# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hddimg, iso, etc. +# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hdddirect, hddimg, iso, etc. IMAGE_TYPES_MASKED ?= "" # The WICVARS variable is used to define list of bitbake variables used in wic code |