diff options
author | Randy Witt <randy.e.witt@linux.intel.com> | 2017-02-21 10:04:49 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-18 13:07:32 +0100 |
commit | 6c3d10ea62ad282a764da83aa701f92c6d3db6cb (patch) | |
tree | dee31a19fcbf9eb3e73a383964a18806f1e5e50e /meta/classes | |
parent | 7c0a184f8b5412a109fdeeb0d89c501e41ede35a (diff) | |
download | poky-6c3d10ea62ad282a764da83aa701f92c6d3db6cb.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: c0ff0e1ff872b04006b26c6db4f8c9cf053b0764)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 037d39898e0e16c6d5b24a8d3844abfb328d3c14)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image_types.bbclass | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 1ce8334e3a..5020a5a9d4 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', True) or "").split()) | 26 | fstypes = set((d.getVar('IMAGE_FSTYPES', True) or "").split()) |
21 | fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS', True) or "").split()) | 27 | fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS', True) 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, True) , deps) | 32 | adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps) |
33 | |||
29 | for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): | 34 | for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): |
35 | base, rest = split_types(typedepends) | ||
36 | resttypes += rest | ||
30 | adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) | 37 | adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) |
38 | |||
31 | for ctype in resttypes: | 39 | for ctype in resttypes: |
32 | adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) | 40 | adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) |
33 | adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps) | 41 | adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps) |