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>

diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 3d2c6a4..5840803 100644 (file)
--- 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: