diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-02-24 01:23:57 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:32:37 +0000 |
| commit | c5a402bcd0ebf0238f7f7f8bcc08a0790cba7a67 (patch) | |
| tree | 6f0ffbc528c083ee2de0fee98a60daad613f8ee5 /meta | |
| parent | d2eba0a5b67936983ad85766349f7afa4bdb70e8 (diff) | |
| download | openembedded-core-contrib-c5a402bcd0ebf0238f7f7f8bcc08a0790cba7a67.tar.gz | |
boot-directdisk.bbclass: drop IS_VM chechking
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/boot-directdisk.bbclass | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index ce637b89d7..89007e315b 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 |