summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2017-01-05 15:15:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:12 +0000
commitb138a8bba504734f6c2660442f71a8ecc17b8f7c (patch)
tree9e64d200df9de6c377a96d741d3168ff8234f7ca
parentf64e321baf4fdf1dacfa206ed665ade0f8d83812 (diff)
downloadpoky-b138a8bba504734f6c2660442f71a8ecc17b8f7c.tar.gz
image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types
Previously if IMAGE_TYPEDEP_* contained a conversion type of the form, "foo.bar", the dependency on CONVERSION_DEPENDS_bar would not get added to the task depends for do_rootfs. [YOCTO #10883] (From OE-Core rev: 037d39898e0e16c6d5b24a8d3844abfb328d3c14) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types.bbclass14
1 files changed, 11 insertions, 3 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index b526cfaa3a..7748dee8eb 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -17,17 +17,25 @@ def imagetypes_getdepends(d):
17 d += ":do_populate_sysroot" 17 d += ":do_populate_sysroot"
18 deps.add(d) 18 deps.add(d)
19 19
20 # Take a type in the form of foo.bar.car and split it into the items
21 # needed for the image deps "foo", and the conversion deps ["bar", "car"]
22 def split_types(typestring):
23 types = typestring.split(".")
24 return types[0], types[1:]
25
20 fstypes = set((d.getVar('IMAGE_FSTYPES') or "").split()) 26 fstypes = set((d.getVar('IMAGE_FSTYPES') or "").split())
21 fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS') or "").split()) 27 fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS') or "").split())
22 28
23 deps = set() 29 deps = set()
24 for typestring in fstypes: 30 for typestring in fstypes:
25 types = typestring.split(".") 31 basetype, resttypes = split_types(typestring)
26 basetype, resttypes = types[0], types[1:]
27
28 adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps) 32 adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps)
33
29 for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split(): 34 for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split():
35 base, rest = split_types(typedepends)
36 resttypes += rest
30 adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends) , deps) 37 adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends) , deps)
38
31 for ctype in resttypes: 39 for ctype in resttypes:
32 adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps) 40 adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps)
33 adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype), deps) 41 adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype), deps)