summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-17 20:42:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-19 08:56:51 +0100
commit7a220aeaae6ae9a110a77a04c7772f196ae895a1 (patch)
tree0ca1ab53e630b0853ca95304d80d2c705600e8fb
parentbc3a206de379de5d79af2a08b9b8ff56ae06e68d (diff)
downloadpoky-7a220aeaae6ae9a110a77a04c7772f196ae895a1.tar.gz
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>
-rw-r--r--bitbake/lib/bb/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 3bc243723b..3f1c645de3 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -250,6 +250,7 @@ def explode_dep_versions2(s):
250 if not (i in r and r[i]): 250 if not (i in r and r[i]):
251 r[lastdep] = [] 251 r[lastdep] = []
252 252
253 r = collections.OrderedDict(sorted(r.items(), key=lambda x: x[0]))
253 return r 254 return r
254 255
255def explode_dep_versions(s): 256def explode_dep_versions(s):