image_types: Remove remnants of hdddirect

PATCH New Daniel Ammann 1 participant 1 message Jul 23, 2019

lore

Share & tools

lore

Daniel Ammann

author

2019-07-23 10:21 UTC #0 lore raw

PATCH 1/1 image_types: Remove remnants of hdddirect

hdddirect was removed in commit 929ba563f1bc7195c4981b8e139c432b2cc388ea.

Signed-off-by Daniel Ammann <[email protected]>

---
 meta/classes/image_types.bbclass | 2 +-
 meta/classes/syslinux.bbclass    | 5 -----
 scripts/runqemu                  | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

meta/classes/image_types.bbclass +1 -1

index fd98a7d1bd..617aa4ccd8 100644
@@ -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

meta/classes/syslinux.bbclass +0 -5

index 031dacbf7d..894f6b3718 100644
@@ -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

scripts/runqemu +1 -1

index 4079f2b17d..3aa74f3d6d 100755
@@ -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

Signature · 1 line

2.11.0