[oe-commits] [openembedded-core] 14/48: image_types.bbclass: fix image dependency chain collection

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch morty
in repository openembedded-core.

commit 854fff614059100494326adeec7c48fa5272d080
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Tue Feb 21 10:04:50 2017 -0800

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit 8a9f249a9166347cc0468191ce130003e3d306e1)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5020a5a..3bfa60b 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.