diff options
Diffstat (limited to 'bitbake/lib/bb/providers.py')
-rw-r--r-- | bitbake/lib/bb/providers.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index db02a0b0de..0e9c8344d2 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -123,11 +123,11 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
123 | 123 | ||
124 | # pn can contain '_', e.g. gcc-cross-x86_64 and an override cannot | 124 | # pn can contain '_', e.g. gcc-cross-x86_64 and an override cannot |
125 | # hence we do this manually rather than use OVERRIDES | 125 | # hence we do this manually rather than use OVERRIDES |
126 | preferred_v = cfgData.getVar("PREFERRED_VERSION_pn-%s" % pn, True) | 126 | preferred_v = cfgData.getVar("PREFERRED_VERSION_pn-%s" % pn) |
127 | if not preferred_v: | 127 | if not preferred_v: |
128 | preferred_v = cfgData.getVar("PREFERRED_VERSION_%s" % pn, True) | 128 | preferred_v = cfgData.getVar("PREFERRED_VERSION_%s" % pn) |
129 | if not preferred_v: | 129 | if not preferred_v: |
130 | preferred_v = cfgData.getVar("PREFERRED_VERSION", True) | 130 | preferred_v = cfgData.getVar("PREFERRED_VERSION") |
131 | 131 | ||
132 | if preferred_v: | 132 | if preferred_v: |
133 | m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) | 133 | m = re.match('(\d+:)*(.*)(_.*)*', preferred_v) |
@@ -289,7 +289,7 @@ def filterProviders(providers, item, cfgData, dataCache): | |||
289 | 289 | ||
290 | eligible = _filterProviders(providers, item, cfgData, dataCache) | 290 | eligible = _filterProviders(providers, item, cfgData, dataCache) |
291 | 291 | ||
292 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % item, True) | 292 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % item) |
293 | if prefervar: | 293 | if prefervar: |
294 | dataCache.preferred[item] = prefervar | 294 | dataCache.preferred[item] = prefervar |
295 | 295 | ||
@@ -318,7 +318,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): | |||
318 | eligible = _filterProviders(providers, item, cfgData, dataCache) | 318 | eligible = _filterProviders(providers, item, cfgData, dataCache) |
319 | 319 | ||
320 | # First try and match any PREFERRED_RPROVIDER entry | 320 | # First try and match any PREFERRED_RPROVIDER entry |
321 | prefervar = cfgData.getVar('PREFERRED_RPROVIDER_%s' % item, True) | 321 | prefervar = cfgData.getVar('PREFERRED_RPROVIDER_%s' % item) |
322 | foundUnique = False | 322 | foundUnique = False |
323 | if prefervar: | 323 | if prefervar: |
324 | for p in eligible: | 324 | for p in eligible: |
@@ -345,7 +345,7 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache): | |||
345 | pn = dataCache.pkg_fn[p] | 345 | pn = dataCache.pkg_fn[p] |
346 | provides = dataCache.pn_provides[pn] | 346 | provides = dataCache.pn_provides[pn] |
347 | for provide in provides: | 347 | for provide in provides: |
348 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide, True) | 348 | prefervar = cfgData.getVar('PREFERRED_PROVIDER_%s' % provide) |
349 | #logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) | 349 | #logger.debug(1, "checking PREFERRED_PROVIDER_%s (value %s) against %s", provide, prefervar, pns.keys()) |
350 | if prefervar in pns and pns[prefervar] not in preferred: | 350 | if prefervar in pns and pns[prefervar] not in preferred: |
351 | var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) | 351 | var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar) |