MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

image_types: Remove remnants of hdddirect

Browse Source 
hdddirect was removed in commit 929ba563f1bc7195c4981b8e139c432b2cc388ea.

(From OE-Core rev: 7a91a9818057d69cba32db2428ffc1a1ebb3876e)

Signed-off-by: Daniel Ammann <daniel.ammann@bytesatwork.ch>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Daniel Ammann 2019-07-23 12:13:34 +02:00 committed by Richard Purdie
parent 65287e95ac
commit d3ed42ef27
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/image_types.bbclass
View File

@ -324,7 +324,7 @@ RUNNABLE_MACHINE_PATTERNS ?= "qemu"
DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso"
# The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, # 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 ?= "" IMAGE_TYPES_MASKED ?= ""
# bmap requires python3 to be in the PATH # bmap requires python3 to be in the PATH

5
meta/classes/syslinux.bbclass
View File

@ -75,11 +75,6 @@ syslinux_hddimg_install() {
syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg
} }
syslinux_hdddirect_install() {
DEST=$1
syslinux $DEST
}
python build_syslinux_cfg () { python build_syslinux_cfg () {
import copy import copy
import sys import sys

2
scripts/runqemu
View File

@ -188,7 +188,7 @@ class BaseConfig(object):
self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi') self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi')
self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs',
'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz') 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz')
self.vmtypes = ('hddimg', 'hdddirect', 'iso') self.vmtypes = ('hddimg', 'iso')
self.fsinfo = {} self.fsinfo = {}
self.network_device = "-device e1000,netdev=net0,mac=@MAC@" self.network_device = "-device e1000,netdev=net0,mac=@MAC@"
# Use different mac section for tap and slirp to avoid # Use different mac section for tap and slirp to avoid