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:33:03 +0000 |
commit | 07dc765cfe0b87aa200673a71d7c5651dc988621 (patch) | |
tree | 876ece6b9a556d8dbeb28f3eb387290d1034a555 /meta/classes | |
parent | a87574cd7ebe30382e5a58b7a074b587adf70cbc (diff) | |
download | poky-07dc765cfe0b87aa200673a71d7c5651dc988621.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.
(From OE-Core rev: c5a402bcd0ebf0238f7f7f8bcc08a0790cba7a67)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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}" | |||
62 | SYSLINUX_ROOT ?= "root=/dev/sda2" | 62 | SYSLINUX_ROOT ?= "root=/dev/sda2" |
63 | SYSLINUX_TIMEOUT ?= "10" | 63 | SYSLINUX_TIMEOUT ?= "10" |
64 | 64 | ||
65 | IS_VM = '${@bb.utils.contains_any("IMAGE_FSTYPES", ["vmdk", "vdi", "qcow2"], "true", "false", d)}' | ||
66 | |||
67 | boot_direct_populate() { | 65 | boot_direct_populate() { |
68 | dest=$1 | 66 | dest=$1 |
69 | install -d $dest | 67 | install -d $dest |
@@ -102,12 +100,10 @@ build_boot_dd() { | |||
102 | efi_hddimg_populate $HDDDIR | 100 | efi_hddimg_populate $HDDDIR |
103 | fi | 101 | fi |
104 | 102 | ||
105 | if [ "${IS_VM}" = "true" ]; then | 103 | if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then |
106 | if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then | 104 | install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/ |
107 | install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/ | 105 | if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then |
108 | if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then | 106 | install -m 0644 ${SYSLINUX_SPLASH} $HDDDIR/${SYSLINUXDIR}/splash.lss |
109 | install -m 0644 ${SYSLINUX_SPLASH} $HDDDIR/${SYSLINUXDIR}/splash.lss | ||
110 | fi | ||
111 | fi | 107 | fi |
112 | fi | 108 | fi |
113 | 109 | ||