]> code.ossystems Code Review - openembedded-core.git/commitdiff
image_types.bbclass: fix image dependency chain collection
authorAndre McCurdy <armccurdy@gmail.com>
Mon, 6 Feb 2017 03:42:48 +0000 (19:42 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 7 Feb 2017 14:48:56 +0000 (14:48 +0000)
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>
meta/classes/image_types.bbclass

index 0adb6e4811b30a7503ff2406404e1f84d97f7ede..fd19112a12614ff292ba44ce09538f48871618e9 100644 (file)
@@ -33,8 +33,8 @@ def imagetypes_getdepends(d):
 
         for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split():
             base, rest = split_types(typedepends)
+            adddep(d.getVar('IMAGE_DEPENDS_%s' % base) , deps)
             resttypes += rest
-            adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends) , deps)
 
         for ctype in resttypes:
             adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps)