diff options
Diffstat (limited to 'bitbake/lib/bb/taskdata.py')
-rw-r--r-- | bitbake/lib/bb/taskdata.py | 46 |
1 files changed, 9 insertions, 37 deletions
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 632a84276..f448b5b66 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py @@ -23,7 +23,7 @@ Task data collection and handling # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from bb import data, fetch, event, mkdirhier, utils +from bb import data, event, mkdirhier, utils import bb, os class TaskData: @@ -357,7 +357,7 @@ class TaskData: all_p = dataCache.providers[item] - eligible = bb.providers.filterProviders(all_p, item, cfgData, dataCache) + eligible, foundUnique = bb.providers.filterProviders(all_p, item, cfgData, dataCache) for p in eligible: fnid = self.getfn_id(p) @@ -369,22 +369,7 @@ class TaskData: bb.event.fire(bb.event.NoProvider(item, cfgData)) raise bb.providers.NoProvider(item) - prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % item, cfgData, 1) - if prefervar: - dataCache.preferred[item] = prefervar - - discriminated = False - if item in dataCache.preferred: - for p in eligible: - pn = dataCache.pkg_fn[p] - if dataCache.preferred[item] == pn: - bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy %s due to PREFERRED_PROVIDERS" % (pn, item)) - eligible.remove(p) - eligible = [p] + eligible - discriminated = True - break - - if len(eligible) > 1 and discriminated == False: + if len(eligible) > 1 and foundUnique == False: if item not in self.consider_msgs_cache: providers_list = [] for fn in eligible: @@ -424,7 +409,7 @@ class TaskData: bb.event.fire(bb.event.NoProvider(item, cfgData, runtime=True)) raise bb.providers.NoRProvider(item) - eligible = bb.providers.filterProviders(all_p, item, cfgData, dataCache) + eligible, numberPreferred = bb.providers.filterProvidersRunTime(all_p, item, cfgData, dataCache) for p in eligible: fnid = self.getfn_id(p) @@ -436,21 +421,7 @@ class TaskData: bb.event.fire(bb.event.NoProvider(item, cfgData, runtime=True)) raise bb.providers.NoRProvider(item) - # Should use dataCache.preferred here? - preferred = [] - for p in eligible: - pn = dataCache.pkg_fn[p] - provides = dataCache.pn_provides[pn] - for provide in provides: - prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % provide, cfgData, 1) - if prefervar == pn: - bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy runtime %s due to PREFERRED_PROVIDERS" % (pn, item)) - eligible.remove(p) - eligible = [p] + eligible - preferred.append(p) - break - - if len(eligible) > 1 and len(preferred) == 0: + if len(eligible) > 1 and numberPreferred == 0: if item not in self.consider_msgs_cache: providers_list = [] for fn in eligible: @@ -460,12 +431,12 @@ class TaskData: bb.event.fire(bb.event.MultipleProviders(item,providers_list, cfgData, runtime=True)) self.consider_msgs_cache.append(item) - if len(preferred) > 1: + if numberPreferred > 1: if item not in self.consider_msgs_cache: providers_list = [] - for fn in preferred: + for fn in eligible: providers_list.append(dataCache.pkg_fn[fn]) - bb.msg.note(2, bb.msg.domain.Provider, "multiple preferred providers are available for runtime %s (%s);" % (item, ", ".join(providers_list))) + bb.msg.note(2, bb.msg.domain.Provider, "multiple providers are available for runtime %s (top %s entries preferred) (%s);" % (item, numberPreferred, ", ".join(providers_list))) bb.msg.note(2, bb.msg.domain.Provider, "consider defining only one PREFERRED_PROVIDER entry to match runtime %s" % item) bb.event.fire(bb.event.MultipleProviders(item,providers_list, cfgData, runtime=True)) self.consider_msgs_cache.append(item) @@ -538,6 +509,7 @@ class TaskData: except bb.providers.NoProvider: targetid = self.getbuild_id(target) if self.abort and targetid in self.external_targets: + bb.msg.error(bb.msg.domain.Provider, "No providers of build target %s (for %s)" % (target, self.get_dependees_str(target))) raise self.remove_buildtarget(targetid) for target in self.get_unresolved_run_targets(dataCache): |