summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2013-10-23 13:47:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-24 08:38:27 +0100
commit754e8768b69acba89bd6c3ba5dbe55b9df4d8083 (patch)
tree20b41f93cf8d7753fbe3db651ec10daddbe7e3c3 /meta/classes
parentffb440c37c3491fa5d9a1408341f7c15eacdc9ce (diff)
downloadpoky-754e8768b69acba89bd6c3ba5dbe55b9df4d8083.tar.gz
base.bbclass: fix nondeterministic PACKAGECONFIG processing order
The PACKAGECONFIG flags were iterated over using dict.items(), but this returns the items in an undefined order. As this order determines the EXTRA_OECONF append order, we can get EXTRA_OECONF which are functionally equivalent, but whose contents differ, resulting in not using shared state archives we should be using. (From OE-Core rev: 843a5dd8f8f0461e286d9fdb3ba55205b4275f88) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index dfa580c583..93bc700a50 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -433,7 +433,7 @@ python () {
433 extradeps = [] 433 extradeps = []
434 extrardeps = [] 434 extrardeps = []
435 extraconf = [] 435 extraconf = []
436 for flag, flagval in pkgconfigflags.items(): 436 for flag, flagval in sorted(pkgconfigflags.items()):
437 if flag == "defaultval": 437 if flag == "defaultval":
438 continue 438 continue
439 items = flagval.split(",") 439 items = flagval.split(",")