diff options
author | Christopher Larson <kergoth@gmail.com> | 2013-10-23 13:47:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:01 +0000 |
commit | 263b6aa58e92ba84b67a2d226450bce82e212200 (patch) | |
tree | bcb00e0a17ce4b481e6e454c2435f17091ffc0bc /meta | |
parent | c2be5243704d2d733deb45eea1b8c678d124f957 (diff) | |
download | poky-263b6aa58e92ba84b67a2d226450bce82e212200.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 master rev: 843a5dd8f8f0461e286d9fdb3ba55205b4275f88)
(From OE-Core rev: 73f77c195e1af3df594eecce2cab47ee963d5c2e)
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 2 |
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(",") |