summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-09 10:18:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-09 10:25:47 +0000
commit4aac8d87d47636f1d3a7f6688d36bf4bcae4448a (patch)
tree2b7f861b0934dae101bc702373481f3ddfef3a23 /bitbake/lib
parentb7ff099556d5387465e2cac8e1211ef8a8f5e962 (diff)
downloadast2050-yocto-poky-4aac8d87d47636f1d3a7f6688d36bf4bcae4448a.zip
ast2050-yocto-poky-4aac8d87d47636f1d3a7f6688d36bf4bcae4448a.tar.gz
bitbake: data: Ensure we add the contains keys in a particular order
If we don't sort the data, the values can reorder changing the signatures meaning we get confused builds and significant cache misses. (Bitbake rev: 8f453bb11d72afc90a986ac604b3477d97eaf9a8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 3d2c6a4..5840803 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -301,9 +301,9 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
def handle_contains(value, contains, d):
newvalue = ""
- for k in contains:
+ for k in sorted(contains):
l = (d.getVar(k, True) or "").split()
- for word in contains[k]:
+ for word in sorted(contains[k]):
if word in l:
newvalue += "\n%s{%s} = Set" % (k, word)
else:
OpenPOWER on IntegriCloud