summaryrefslogtreecommitdiff
path: root/meta/classes/boot-directdisk.bbclass
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2015-06-03 11:07:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:55:42 +0100
commit605dd9f8eb719d0aa278c8ec892e62214cdcfddc (patch)
treeb50ce5c3c75dd48ee96b2ad26c44ed1c9457e071 /meta/classes/boot-directdisk.bbclass
parentdeb7ee16cd04b03417a68d32d14b5b0ad3c59eca (diff)
downloadopenembedded-core-605dd9f8eb719d0aa278c8ec892e62214cdcfddc.tar.gz
openembedded-core-605dd9f8eb719d0aa278c8ec892e62214cdcfddc.tar.bz2
openembedded-core-605dd9f8eb719d0aa278c8ec892e62214cdcfddc.zip
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>
Diffstat (limited to 'meta/classes/boot-directdisk.bbclass')
-rw-r--r--meta/classes/boot-directdisk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 44f738b02e..c5765233ac 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