]> code.ossystems Code Review - openembedded-core.git/commitdiff
boot-directdisk.bbclass: drop IS_VM chechking
authorRobert Yang <liezhi.yang@windriver.com>
Wed, 24 Feb 2016 09:23:57 +0000 (01:23 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 28 Feb 2016 11:32:37 +0000 (11:32 +0000)
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.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/boot-directdisk.bbclass

index ce637b89d7bd5d2de773110e89ff07dd9a9719bc..89007e315b49cb241cc38c937fbae8f60fe21462 100644 (file)
@@ -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