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:41:38 +0100 |
commit | d3ed42ef277c0d82928fa7ea95597e46e22a93c2 (patch) | |
tree | 1b66abe78b6081905e3cba30f66b5503390dac7d /meta/classes | |
parent | 65287e95aca3410711a03639e7c7251811a23ebd (diff) | |
download | poky-d3ed42ef277c0d82928fa7ea95597e46e22a93c2.tar.gz |
image_types: Remove remnants of hdddirect
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>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image_types.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/syslinux.bbclass | 5 |
2 files changed, 1 insertions, 6 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" | |||
324 | DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" | 324 | DEPLOYABLE_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. |
328 | IMAGE_TYPES_MASKED ?= "" | 328 | IMAGE_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 | ||
78 | syslinux_hdddirect_install() { | ||
79 | DEST=$1 | ||
80 | syslinux $DEST | ||
81 | } | ||
82 | |||
83 | python build_syslinux_cfg () { | 78 | python build_syslinux_cfg () { |
84 | import copy | 79 | import copy |
85 | import sys | 80 | import sys |