[bitbake-devel] [PATCH 1/1] bitbake: Abort build if runtime dependency conflict
wenzong.fan at windriver.com
wenzong.fan at windriver.com
Wed Jul 11 03:28:11 UTC 2012
From: Wenzong Fan <wenzong.fan at windriver.com>
Currently if there are multiple preferred providers available for
a runtime dependency, bitbake will print an Error message and let
the build go on. Anyways the build should abort while any Errors
occured.
[YOCTO #2734]
Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
---
bitbake/lib/bb/providers.py | 2 ++
bitbake/lib/bb/taskdata.py | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py
index bd729df..24cb217 100644
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -35,6 +35,8 @@ class NoProvider(bb.BBHandledException):
class NoRProvider(bb.BBHandledException):
"""Exception raised when no provider of a runtime dependency can be found"""
+class MultipleRProvider(bb.BBHandledException):
+ """Exception raised when multiple providers of a runtime dependency can be found"""
def findProviders(cfgData, dataCache, pkg_pn = None):
"""
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py
index 55cdde5..aed3a16 100644
--- a/bitbake/lib/bb/taskdata.py
+++ b/bitbake/lib/bb/taskdata.py
@@ -482,6 +482,7 @@ class TaskData:
providers_list.append(dataCache.pkg_fn[fn])
bb.event.fire(bb.event.MultipleProviders(item, providers_list, runtime=True), cfgData)
self.consider_msgs_cache.append(item)
+ raise bb.providers.MultipleRProvider(item)
# run through the list until we find one that we can build
for fn in eligible:
@@ -580,7 +581,7 @@ class TaskData:
try:
self.add_rprovider(cfgData, dataCache, target)
added = added + 1
- except bb.providers.NoRProvider:
+ except (bb.providers.NoRProvider, bb.providers.MultipleRProvider):
self.remove_runtarget(self.getrun_id(target))
logger.debug(1, "Resolved " + str(added) + " extra dependencies")
if added == 0:
--
1.7.3
More information about the bitbake-devel
mailing list