[OE-core] [PATCH 2/4] boot-directdisk.bbclass: drop IS_VM chechking

[Robert Yang]

The IS_VM was used for making menus for vmdk, vdi and qcow2, except
hddimg, there is no reason to not make menus for hddimg, so drop it.

Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
---
 meta/classes/boot-directdisk.bbclass |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/meta/classes/boot-directdisk.bbclass 
b/meta/classes/boot-directdisk.bbclass
index ce637b8..89007e3 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -62,8 +62,6 @@ DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
 SYSLINUX_ROOT ?= "root=/dev/sda2"
 SYSLINUX_TIMEOUT ?= "10"
 
-IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2"], 
"true", "false", d)}'
-
 boot_direct_populate() {
        dest=$1
        install -d $dest
@@ -102,12 +100,10 @@ build_boot_dd() {
                efi_hddimg_populate $HDDDIR
        fi
 
-       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
-                               install -m 0644 ${SYSLINUX_SPLASH} 
$HDDDIR/${SYSLINUXDIR}/splash.lss
-                       fi
+       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
+                       install -m 0644 ${SYSLINUX_SPLASH} 
$HDDDIR/${SYSLINUXDIR}/splash.lss
                fi
        fi
 
-- 
1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core