From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 18 Jul 2016 03:42:51 +0000 (-0700)
Subject: lib/bb/utils.py: return sorted OrderedDict in explode_dep_versions2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a392f19f16ef8202ce3c12afbeb186a02438da17;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 3bc243723bb..3f1c645de3b 100644
--- a/lib/bb/utils.py
+++ b/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):