summaryrefslogtreecommitdiffstats
path: root/meta/classes
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:59:13 +0100
commita0b51649232cdf2ac44f28a95d446286eaa59875 (patch)
tree9e12d149d8a8bb4cd2e30cb68fa1008009016f52 /meta/classes
parentfe0f6434969aa4868467e7882c372f5eb7a834f1 (diff)
downloadpoky-a0b51649232cdf2ac44f28a95d446286eaa59875.tar.gz
boot-direct.bbclass: Add support for VDI images
Same treatment for both VMDK and VDI images. (From OE-Core rev: 605dd9f8eb719d0aa278c8ec892e62214cdcfddc) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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}"
63SYSLINUX_ROOT ?= "root=/dev/sda2" 63SYSLINUX_ROOT ?= "root=/dev/sda2"
64SYSLINUX_TIMEOUT ?= "10" 64SYSLINUX_TIMEOUT ?= "10"
65 65
66IS_VMDK = '${@bb.utils.contains("IMAGE_FSTYPES", "vmdk", "true", "false", d)}' 66IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk" ,"vdi"], "true", "false", d)}'
67 67
68boot_direct_populate() { 68boot_direct_populate() {
69 dest=$1 69 dest=$1
@@ -101,7 +101,7 @@ build_boot_dd() {
101 efi_hddimg_populate $HDDDIR 101 efi_hddimg_populate $HDDDIR
102 fi 102 fi
103 103
104 if [ "${IS_VMDK}" = "true" ]; then 104 if [ "${IS_VM}" = "true" ]; then
105 if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then 105 if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then
106 install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/ 106 install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/
107 if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then 107 if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then