[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3933/8267] lib/oe.sstatesig: make locked sig file consistent

[Emmanuele Bassi <ebassi src gnome org>]

commit c782cb40d791e959b328998de2f77ca65546084e
Author: Jianxun Zhang <jianxun zhang linux intel com>
Date:   Wed Dec 21 14:31:46 2016 -0800

    lib/oe.sstatesig: make locked sig file consistent
    
    Sort keys of dict 'types' prior to dumping, in order to have
    identical output every time. This could make it a little easier
    to diff these human-readable dumps.
    
    (From OE-Core rev: 8abbaba1931e2cb2b87aa733aa9a3e8eb359b500)
    
    Signed-off-by: Jianxun Zhang <jianxun zhang linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/sstatesig.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index bd11e2f..13fd3bd 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -197,7 +197,8 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
             types[t].append(k)
 
         with open(sigfile, "w") as f:
-            for t in types:
+            l = sorted(types)
+            for t in l:
                 f.write('SIGGEN_LOCKEDSIGS_%s = "\\\n' % t)
                 types[t].sort()
                 sortedk = sorted(types[t], key=lambda k: self.lockedpnmap[k.rsplit(".",1)[0]])
@@ -208,7 +209,7 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
                         continue
                     f.write("    " + self.lockedpnmap[fn] + ":" + task + ":" + self.taskhash[k] + " \\\n")
                 f.write('    "\n')
-            f.write('SIGGEN_LOCKEDSIGS_TYPES_%s = "%s"' % (self.machine, " ".join(list(types.keys()))))
+            f.write('SIGGEN_LOCKEDSIGS_TYPES_%s = "%s"' % (self.machine, " ".join(l)))
 
     def checkhashes(self, missed, ret, sq_fn, sq_task, sq_hash, sq_hashfn, d):
         warn_msgs = []