diff options
-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): | |||
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) |