diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 11:50:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 11:59:42 +0000 |
commit | b567235c0ce427e2cd478a0268a295c74208e917 (patch) | |
tree | 3a456e4c16c8c4f81ed8772e0729c3b8138bf46f /meta/classes/image.bbclass | |
parent | e914e2ac15e2f3c12952b68b685d57360c70a2de (diff) | |
download | openembedded-core-contrib-b567235c0ce427e2cd478a0268a295c74208e917.tar.gz |
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>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 96666d529f..cc8a23c526 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -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_"): |