summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image_types.bbclass2
-rw-r--r--meta/classes/syslinux.bbclass5
-rwxr-xr-xscripts/runqemu2
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"
324DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" 324DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso"
325 325
326# The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, 326# The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES,
327# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hdddirect, hddimg, iso, etc. 327# images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hddimg, iso, etc.
328IMAGE_TYPES_MASKED ?= "" 328IMAGE_TYPES_MASKED ?= ""
329 329
330# bmap requires python3 to be in the PATH 330# 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() {
75 syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg 75 syslinux ${IMGDEPLOYDIR}/${IMAGE_NAME}.hddimg
76} 76}
77 77
78syslinux_hdddirect_install() {
79 DEST=$1
80 syslinux $DEST
81}
82
83python build_syslinux_cfg () { 78python build_syslinux_cfg () {
84 import copy 79 import copy
85 import sys 80 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):
188 self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi') 188 self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi')
189 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', 189 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs',
190 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz') 190 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz')
191 self.vmtypes = ('hddimg', 'hdddirect', 'iso') 191 self.vmtypes = ('hddimg', 'iso')
192 self.fsinfo = {} 192 self.fsinfo = {}
193 self.network_device = "-device e1000,netdev=net0,mac=@MAC@" 193 self.network_device = "-device e1000,netdev=net0,mac=@MAC@"
194 # Use different mac section for tap and slirp to avoid 194 # Use different mac section for tap and slirp to avoid