[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1292/8267] bitbake: lib/bb/utils.py: return sorted OrderedDict in explode_dep_versions2

[Emmanuele Bassi <ebassi src gnome org>]

commit 7a220aeaae6ae9a110a77a04c7772f196ae895a1
Author: Robert Yang <liezhi yang windriver com>
Date:   Sun Jul 17 20:42:51 2016 -0700

    bitbake: lib/bb/utils.py: return sorted OrderedDict in explode_dep_versions2
    
    The OrderedDict's item is sorted by insertion order, there might be a
    problem when build the same recipe again, for example:
    - First build of acl:
      Depends: libattr1 (>= 2.4.47), libc6 (>= 2.24)
    - Second build of acl:
      Depends: libc6 (>= 2.24), libattr1 (>= 2.4.47)
    
    They are exactly the same depends, but tools like "diff" doesn't think
    so. Return sorted OrderedDict will fix the problem.
    
    (Bitbake rev: a392f19f16ef8202ce3c12afbeb186a02438da17)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/utils.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 3bc2437..3f1c645 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -250,6 +250,7 @@ def explode_dep_versions2(s):
         if not (i in r and r[i]):
             r[lastdep] = []
 
+    r = collections.OrderedDict(sorted(r.items(), key=lambda x: x[0]))
     return r
 
 def explode_dep_versions(s):