[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3989/8267] image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types

[Emmanuele Bassi <ebassi src gnome org>]

commit b138a8bba504734f6c2660442f71a8ecc17b8f7c
Author: Randy Witt <randy e witt linux intel com>
Date:   Thu Jan 5 15:15:44 2017 -0800

    image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types
    
    Previously if IMAGE_TYPEDEP_* contained a conversion type of the form,
    "foo.bar", the dependency on CONVERSION_DEPENDS_bar would not get added
    to the task depends for do_rootfs.
    
    [YOCTO #10883]
    
    (From OE-Core rev: 037d39898e0e16c6d5b24a8d3844abfb328d3c14)
    
    Signed-off-by: Randy Witt <randy e witt linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 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 b526cfa..7748dee 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -17,17 +17,25 @@ def imagetypes_getdepends(d):
                 d += ":do_populate_sysroot"
             deps.add(d)
 
+    # Take a type in the form of foo.bar.car and split it into the items
+    # needed for the image deps "foo", and the conversion deps ["bar", "car"]
+    def split_types(typestring):
+        types = typestring.split(".")
+        return types[0], types[1:]
+
     fstypes = set((d.getVar('IMAGE_FSTYPES') or "").split())
     fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS') or "").split())
 
     deps = set()
     for typestring in fstypes:
-        types = typestring.split(".")
-        basetype, resttypes = types[0], types[1:]
-
+        basetype, resttypes = split_types(typestring)
         adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps)
+
         for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split():
+            base, rest = split_types(typedepends)
+            resttypes += rest
             adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends) , deps)
+
         for ctype in resttypes:
             adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps)
             adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype), deps)