diff options
-rw-r--r-- | bitbake/lib/bb/providers.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index 09e5701f2e..95152323ef 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -256,10 +256,13 @@ def _filterProviders(providers, item, cfgData, dataCache): | |||
256 | 256 | ||
257 | logger.debug("providers for %s are: %s", item, list(sorted(pkg_pn.keys()))) | 257 | logger.debug("providers for %s are: %s", item, list(sorted(pkg_pn.keys()))) |
258 | 258 | ||
259 | # First add PREFERRED_VERSIONS | 259 | # First add REQUIRED_VERSIONS or PREFERRED_VERSIONS |
260 | for pn in sorted(pkg_pn): | 260 | for pn in sorted(pkg_pn): |
261 | sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn) | 261 | sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn) |
262 | preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item) | 262 | preferred_ver, preferred_file, required = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item) |
263 | if required and preferred_file is None: | ||
264 | return eligible | ||
265 | preferred_versions[pn] = (preferred_ver, preferred_file) | ||
263 | if preferred_versions[pn][1]: | 266 | if preferred_versions[pn][1]: |
264 | eligible.append(preferred_versions[pn][1]) | 267 | eligible.append(preferred_versions[pn][1]) |
265 | 268 | ||