From 263b6aa58e92ba84b67a2d226450bce82e212200 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 23 Oct 2013 13:47:27 -0700 Subject: [PATCH] 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 Signed-off-by: Richard Purdie Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 () { extradeps = [] extrardeps = [] extraconf = [] - for flag, flagval in pkgconfigflags.items(): + for flag, flagval in sorted(pkgconfigflags.items()): if flag == "defaultval": continue items = flagval.split(",")