aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:31:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 06:10:59 -0800
commiteddab52a4e7c49bfcdc2c26004d0bc777a1e5c25 (patch)
treeddfa99de20b7fd12a9d545e6d976e0cd44f881f2
parent533e1840d553c183e6ab37a350d492187c5eca96 (diff)
downloadbitbake-eddab52a4e7c49bfcdc2c26004d0bc777a1e5c25.zip
bitbake-eddab52a4e7c49bfcdc2c26004d0bc777a1e5c25.tar.gz
bitbake-eddab52a4e7c49bfcdc2c26004d0bc777a1e5c25.tar.bz2
providers: Fix determinism issue
We saw builds where runtime providers were sometimes changing order and the build result was therefore non-deterministic. For example it could show: DEBUG: providers for lib32-initd-functions are: ['lib32-lsbinitscripts', 'lib32-initscripts'] or DEBUG: providers for lib32-initd-functions are: ['lib32-initscripts', 'lib32-lsbinitscripts'] which could cause a test to pass or fail. This change ensures we don't rely on the random order of dictonaries in memory and act deterministically. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/providers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/providers.py b/lib/bb/providers.py
index 443187e..c2aa98c 100644
--- a/lib/bb/providers.py
+++ b/lib/bb/providers.py
@@ -244,17 +244,17 @@ def _filterProviders(providers, item, cfgData, dataCache):
pkg_pn[pn] = []
pkg_pn[pn].append(p)
- logger.debug(1, "providers for %s are: %s", item, list(pkg_pn.keys()))
+ logger.debug(1, "providers for %s are: %s", item, list(sorted(pkg_pn.keys())))
# First add PREFERRED_VERSIONS
- for pn in pkg_pn:
+ for pn in sorted(pkg_pn):
sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn)
preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item)
if preferred_versions[pn][1]:
eligible.append(preferred_versions[pn][1])
# Now add latest versions
- for pn in sortpkg_pn:
+ for pn in sorted(sortpkg_pn):
if pn in preferred_versions and preferred_versions[pn][1]:
continue
preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0])