aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-02-21 10:04:50 -0800
committerArmin Kuster <akuster808@gmail.com>2017-04-01 08:41:18 -0400
commit1c83c4826fed80f2e89c8b9ad3c4b3d1180ef0d4 (patch)
tree9a49667d8d41e063f555f5eadaec39af1495ddc4
parent00dfb1135f5036940c57101e2ee3b572980b6713 (diff)
downloadopenembedded-core-contrib-1c83c4826fed80f2e89c8b9ad3c4b3d1180ef0d4.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". 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>
-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):
for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split():
base, rest = split_types(typedepends)
+ adddep(d.getVar('IMAGE_DEPENDS_%s' % base, True) , deps)
resttypes += rest
- adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps)
for ctype in resttypes:
adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps)