summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-02-21 10:04:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-18 13:07:32 +0100
commit99c6c878ee122a04f23ef49ea653208ca1c7aa77 (patch)
treee23552570be5ef5c081d72349eb2c96553eeb55b /meta/classes
parent6c3d10ea62ad282a764da83aa701f92c6d3db6cb (diff)
downloadpoky-99c6c878ee122a04f23ef49ea653208ca1c7aa77.tar.gz
image_types.bbclass: fix image dependency chain collection
If image type "foo" depends on image type "bar.xz", then dependencies should be collected from the base image type (ie "IMAGE_DEPENDS_bar") not from "IMAGE_DEPENDS_bar.xz". (From OE-Core rev: 854fff614059100494326adeec7c48fa5272d080) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 8a9f249a9166347cc0468191ce130003e3d306e1) 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.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5020a5a9d4..3bfa60ba26 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -33,8 +33,8 @@ def imagetypes_getdepends(d):
33 33
34 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) 35 base, rest = split_types(typedepends)
36 adddep(d.getVar('IMAGE_DEPENDS_%s' % base, True) , deps)
36 resttypes += rest 37 resttypes += rest
37 adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps)
38 38
39 for ctype in resttypes: 39 for ctype in resttypes:
40 adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) 40 adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps)