summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-02-23 00:26:35 -0800
committerRobert Yang <liezhi.yang@windriver.com>2016-02-24 01:04:18 -0800
commit78cf7d00ef861d0053070a2e9ea154e055e0fbd9 (patch)
treed6500a094f6943b77f39fab585c0ba5b5e221371
parentfff0349bafede8c88c8710ef1295464ba62ac471 (diff)
downloadopenembedded-core-contrib-78cf7d00ef861d0053070a2e9ea154e055e0fbd9.tar.gz
openembedded-core-contrib-78cf7d00ef861d0053070a2e9ea154e055e0fbd9.tar.bz2
openembedded-core-contrib-78cf7d00ef861d0053070a2e9ea154e055e0fbd9.zip
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>
-rw-r--r--meta/classes/boot-directdisk.bbclass12
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