From: Juro Bystricky <juro.bystricky@intel.com>
Date: Wed, 3 Jun 2015 18:07:27 +0000 (-0700)
Subject: boot-direct.bbclass: Add support for VDI images
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~30111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=605dd9f8eb719d0aa278c8ec892e62214cdcfddc;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

boot-direct.bbclass: Add support for VDI images

Same treatment for both  VMDK and VDI images.

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 44f738b02ed..c5765233acc 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -63,7 +63,7 @@ DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
 SYSLINUX_ROOT ?= "root=/dev/sda2"
 SYSLINUX_TIMEOUT ?= "10"
 
-IS_VMDK = '${@bb.utils.contains("IMAGE_FSTYPES", "vmdk", "true", "false", d)}'
+IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk" ,"vdi"], "true", "false", d)}'
 
 boot_direct_populate() {
 	dest=$1
@@ -101,7 +101,7 @@ build_boot_dd() {
 		efi_hddimg_populate $HDDDIR
 	fi
 
-	if [ "${IS_VMDK}" = "true" ]; then
+	if [ "${IS_VM}" = "true" ]; then
 		if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then
 			install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/
 			if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then