image/image-live: Add back IMAGE_TYPES_MASKED support
IMAGE_TYPES_MASKED support was accidentally removed. The original idea behind it was to remove some of the hardcoding in the core image code, so do that for image-live and ensure the dependency and masked variables correctly reflect the needs of the class. This means we can remove all the hardcoded special cases since image-vm already has the needed markup. (From OE-Core rev: 9a2d4a3b8d7bb1cf7f1fb7fe47d5c002d9941c89) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e914e2ac15
commit
b567235c0c
|
@ -15,4 +15,6 @@ do_bootimg[depends] += "${PN}:do_image_complete"
|
|||
inherit bootimg
|
||||
|
||||
IMAGE_TYPEDEP_live = "ext4"
|
||||
IMAGE_TYPES_MASKED += "live"
|
||||
IMAGE_TYPEDEP_iso = "ext4"
|
||||
IMAGE_TYPEDEP_hddimg = "ext4"
|
||||
IMAGE_TYPES_MASKED += "live hddimg iso"
|
||||
|
|
|
@ -297,8 +297,6 @@ python () {
|
|||
old_overrides = d.getVar('OVERRIDES', 0)
|
||||
|
||||
def _image_base_type(type):
|
||||
if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]:
|
||||
type = "ext4"
|
||||
basetype = type
|
||||
for ctype in ctypes:
|
||||
if type.endswith("." + ctype):
|
||||
|
@ -346,12 +344,17 @@ python () {
|
|||
|
||||
d.appendVarFlag('do_image', 'vardeps', ' '.join(vardeps))
|
||||
|
||||
maskedtypes = (d.getVar('IMAGE_TYPES_MASKED', True) or "").split()
|
||||
|
||||
for t in basetypes:
|
||||
vardeps = set()
|
||||
cmds = []
|
||||
subimages = []
|
||||
realt = t
|
||||
|
||||
if t in maskedtypes:
|
||||
continue
|
||||
|
||||
localdata = bb.data.createCopy(d)
|
||||
debug = ""
|
||||
if t.startswith("debugfs_"):
|
||||
|
|
Loading…
Reference in New Issue