diff options
author | Randy Witt <randy.e.witt@linux.intel.com> | 2017-01-05 15:15:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-16 18:01:51 +0000 |
commit | 037d39898e0e16c6d5b24a8d3844abfb328d3c14 (patch) | |
tree | 28bdf03e74e3f12de87101a5eb7b03c1c93958e9 /meta | |
parent | 9cf9c725f7d534c326ffd95ec539b041f4ad286f (diff) | |
download | openembedded-core-037d39898e0e16c6d5b24a8d3844abfb328d3c14.tar.gz openembedded-core-037d39898e0e16c6d5b24a8d3844abfb328d3c14.tar.bz2 openembedded-core-037d39898e0e16c6d5b24a8d3844abfb328d3c14.zip |
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]
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-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 b526cfaa3a..7748dee8eb 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -17,17 +17,25 @@ def imagetypes_getdepends(d): d += ":do_populate_sysroot" deps.add(d) + # Take a type in the form of foo.bar.car and split it into the items + # needed for the image deps "foo", and the conversion deps ["bar", "car"] + def split_types(typestring): + types = typestring.split(".") + return types[0], types[1:] + fstypes = set((d.getVar('IMAGE_FSTYPES') or "").split()) fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS') or "").split()) deps = set() for typestring in fstypes: - types = typestring.split(".") - basetype, resttypes = types[0], types[1:] - + basetype, resttypes = split_types(typestring) adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps) + for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split(): + base, rest = split_types(typedepends) + resttypes += rest adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends) , deps) + for ctype in resttypes: adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps) adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype), deps) |