[oe-commits] [openembedded-core] 61/116: boot-directdisk.bbclass: drop IS_VM chechking
git at git.openembedded.org
git at git.openembedded.org
Sun Feb 28 11:29:47 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit c3302f8a5d6d021b0d4108a5e9fa4ae3efa5f442
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Feb 24 01:23:57 2016 -0800
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 at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list