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:13 +0000 |
| commit | 9a2d4a3b8d7bb1cf7f1fb7fe47d5c002d9941c89 (patch) | |
| tree | 9a98cc947b9929fe9171ac24eca966d8d87a3185 | |
| parent | 191c7be3a6cc52911f244323072433f6a1172bf1 (diff) | |
| download | openembedded-core-contrib-9a2d4a3b8d7bb1cf7f1fb7fe47d5c002d9941c89.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image-live.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 624ff38dc2..d2e8b85482 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -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" 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_"): |