[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7831/8267] image.bbclass: Sorted ctypes to avoid basehash error

[Emmanuele Bassi <ebassi src gnome org>]

commit 69e97240b372c6aaf0a9eab82bc1361a23db996d
Author: Gerson Fernando Budke <nandojve gmail com>
Date:   Tue Sep 19 14:15:36 2017 -0300

    image.bbclass: Sorted ctypes to avoid basehash error
    
    When selected multiple subimages a similar error could happend:
      Variable do_image_cpio[subimages] value changed \
        from 'cpio.gz.u-boot cpio.gz' to 'cpio.gz cpio.gz.u-boot'
    To avoid this, 'ctypes' should be sorted at 'gen_conversion_cmds'.
    
    This garantee that 'CONVERSION_CMD_xxx' are always written in tha same
    order and consequently 'do_image_cpio' have the same hash.
    
    (From OE-Core rev: 271f1a5f65b8685a1e3645026876251122ef3974)
    
    Signed-off-by: Gerson Fernando Budke <nandojve gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4850eed..0d14250 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -455,7 +455,7 @@ python () {
 
         rm_tmp_images = set()
         def gen_conversion_cmds(bt):
-            for ctype in ctypes:
+            for ctype in sorted(ctypes):
                 if bt.endswith("." + ctype):
                     type = bt[0:-len(ctype) - 1]
                     if type.startswith("debugfs_"):