From a13c51e751ee76c990fe83f83544e448c6cf543d Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Wed, 3 Jun 2015 11:07:23 -0700 Subject: image: Support for VDI Added support for VirtualBox VDI format. The support was implemented by merging with the already existing VMDK support for VM player by creating a new class image-vm.bbclass. This class replaces the previous VMDK only image-vmdk.class. (From OE-Core rev: 0a3e8eb9f592c3f1edd2c7521855f7406541651a) Signed-off-by: Juro Bystricky Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 58b4add8fa..64ae2cb92b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -130,10 +130,10 @@ def build_live(d): return "image-live" IMAGE_TYPE_live = "${@build_live(d)}" - inherit ${IMAGE_TYPE_live} -IMAGE_TYPE_vmdk = '${@bb.utils.contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}' -inherit ${IMAGE_TYPE_vmdk} + +IMAGE_TYPE_vm = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi"], "image-vm", "", d)}' +inherit ${IMAGE_TYPE_vm} python () { deps = " " + imagetypes_getdepends(d) -- cgit v1.2.3-54-g00ecf