[oe-commits] Christopher Larson : base.bbclass: fix nondeterministic PACKAGECONFIG processing order

git at git.openembedded.org git at git.openembedded.org
Thu Oct 24 07:24:11 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 843a5dd8f8f0461e286d9fdb3ba55205b4275f88
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=843a5dd8f8f0461e286d9fdb3ba55205b4275f88

Author: Christopher Larson <kergoth at gmail.com>
Date:   Wed Oct 23 13:47:27 2013 -0700

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.

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 dfa580c..93bc700 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -433,7 +433,7 @@ python () {
         extradeps = []
         extrardeps = []
         extraconf = []
-        for flag, flagval in pkgconfigflags.items():
+        for flag, flagval in sorted(pkgconfigflags.items()):
             if flag == "defaultval":
                 continue
             items = flagval.split(",")



More information about the Openembedded-commits mailing list