]> code.ossystems Code Review - openembedded-core.git/commitdiff
image_types: Remove remnants of hdddirect
authorDaniel Ammann <daniel.ammann@bytesatwork.ch>
Tue, 23 Jul 2019 10:13:34 +0000 (12:13 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 26 Jul 2019 07:40:54 +0000 (08:40 +0100)
hdddirect was removed in commit 929ba563f1bc7195c4981b8e139c432b2cc388ea.

Signed-off-by: Daniel Ammann <daniel.ammann@bytesatwork.ch>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image_types.bbclass
meta/classes/syslinux.bbclass
scripts/runqemu

index fd98a7d1bdcd40dd8c14265425b5e0a16f43795d..617aa4ccd8fcaa2e1d098fbcfe98af142b8d50e9 100644 (file)
@@ -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
index 031dacbf7d3652c73cc3fe11c724d200cc5ef99f..894f6b37186f95ef4234c54ecd1c21c02372616e 100644 (file)
@@ -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
index 4079f2b17d8d27a9ea749b97c84f0d87381283c9..3aa74f3d6d15d3bee6dcd2c743a69e349373e325 100755 (executable)
@@ -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