summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 11:50:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 11:59:42 +0000
commitb567235c0ce427e2cd478a0268a295c74208e917 (patch)
tree3a456e4c16c8c4f81ed8772e0729c3b8138bf46f /meta
parente914e2ac15e2f3c12952b68b685d57360c70a2de (diff)
downloadpoky-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')
-rw-r--r--meta/classes/image-live.bbclass4
-rw-r--r--meta/classes/image.bbclass7
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"
15inherit bootimg 15inherit bootimg
16 16
17IMAGE_TYPEDEP_live = "ext4" 17IMAGE_TYPEDEP_live = "ext4"
18IMAGE_TYPES_MASKED += "live" 18IMAGE_TYPEDEP_iso = "ext4"
19IMAGE_TYPEDEP_hddimg = "ext4"
20IMAGE_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 () {
297 old_overrides = d.getVar('OVERRIDES', 0) 297 old_overrides = d.getVar('OVERRIDES', 0)
298 298
299 def _image_base_type(type): 299 def _image_base_type(type):
300 if type in ["vmdk", "vdi", "qcow2", "live", "iso", "hddimg"]:
301 type = "ext4"
302 basetype = type 300 basetype = type
303 for ctype in ctypes: 301 for ctype in ctypes:
304 if type.endswith("." + ctype): 302 if type.endswith("." + ctype):
@@ -346,12 +344,17 @@ python () {
346 344
347 d.appendVarFlag('do_image', 'vardeps', ' '.join(vardeps)) 345 d.appendVarFlag('do_image', 'vardeps', ' '.join(vardeps))
348 346
347 maskedtypes = (d.getVar('IMAGE_TYPES_MASKED', True) or "").split()
348
349 for t in basetypes: 349 for t in basetypes:
350 vardeps = set() 350 vardeps = set()
351 cmds = [] 351 cmds = []
352 subimages = [] 352 subimages = []
353 realt = t 353 realt = t
354 354
355 if t in maskedtypes:
356 continue
357
355 localdata = bb.data.createCopy(d) 358 localdata = bb.data.createCopy(d)
356 debug = "" 359 debug = ""
357 if t.startswith("debugfs_"): 360 if t.startswith("debugfs_"):