diff options
| author |   Daniel Ammann <daniel.ammann@bytesatwork.ch> | 2019-07-23 12:13:34 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-26 08:40:54 +0100 |
| commit | 7a91a9818057d69cba32db2428ffc1a1ebb3876e (patch) | |
| tree | bbdc3529eff70908c64ee044bf2d543090e46854 | |
| parent | 277a2bef8ae41a0314ecad27379b299ba7d90f22 (diff) | |
| download | openembedded-core-contrib-7a91a9818057d69cba32db2428ffc1a1ebb3876e.tar.gz | |
image_types: Remove remnants of hdddirect
hdddirect was removed in commit 929ba563f1bc7195c4981b8e139c432b2cc388ea.
Signed-off-by: Daniel Ammann <daniel.ammann@bytesatwork.ch>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image_types.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/syslinux.bbclass | 5 | ||||
| -rwxr-xr-x | scripts/runqemu | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index fd98a7d1bd..617aa4ccd8 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -324,7 +324,7 @@ RUNNABLE_MACHINE_PATTERNS ?= "qemu" DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" # The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, -# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hdddirect, hddimg, iso, etc. +# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hddimg, iso, etc. IMAGE_TYPES_MASKED ?= "" # bmap requires python3 to be in the PATH diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 031dacbf7d..894f6b3718 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -75,11 +75,6 @@ syslinux_hddimg_install() { syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg } -syslinux_hdddirect_install() { - DEST=$1 - syslinux $DEST -} - python build_syslinux_cfg () { import copy import sys diff --git a/scripts/runqemu b/scripts/runqemu index 4079f2b17d..3aa74f3d6d 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -188,7 +188,7 @@ class BaseConfig(object): self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi') self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz') - self.vmtypes = ('hddimg', 'hdddirect', 'iso') + self.vmtypes = ('hddimg', 'iso') self.fsinfo = {} self.network_device = "-device e1000,netdev=net0,mac=@MAC@" # Use different mac section for tap and slirp to avoid |