* [PATCH 0/1] bitbake: Abort build if runtime dependency conflict
@ 2012-07-11 3:28 wenzong.fan
2012-07-11 3:28 ` [PATCH 1/1] " wenzong.fan
0 siblings, 1 reply; 3+ messages in thread
From: wenzong.fan @ 2012-07-11 3:28 UTC (permalink / raw)
To: bitbake-devel
From: Wenzong Fan <wenzong.fan@windriver.com>
If found any runtime dependency conflict from PREFERRED_PROVIDER entries,
bitbake will print an ERROR and let the build go on.
This is a little confusion for a long time build, it should be abort
immediately while an ERROR occured.
The following changes since commit 5142a1e95ed7db7e09ef31f645d45bb7e380d1d6:
subversion: do_install failed (parallel issue) (2012-07-10 20:35:11 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/2734
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/2734
Wenzong Fan (1):
bitbake: Abort build if runtime dependency conflict
bitbake/lib/bb/providers.py | 2 ++
bitbake/lib/bb/taskdata.py | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
--
1.7.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] bitbake: Abort build if runtime dependency conflict
2012-07-11 3:28 [PATCH 0/1] bitbake: Abort build if runtime dependency conflict wenzong.fan
@ 2012-07-11 3:28 ` wenzong.fan
2012-07-11 10:44 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: wenzong.fan @ 2012-07-11 3:28 UTC (permalink / raw)
To: bitbake-devel
From: Wenzong Fan <wenzong.fan@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@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] bitbake: Abort build if runtime dependency conflict
2012-07-11 3:28 ` [PATCH 1/1] " wenzong.fan
@ 2012-07-11 10:44 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2012-07-11 10:44 UTC (permalink / raw)
To: wenzong.fan; +Cc: bitbake-devel
On Wed, 2012-07-11 at 11:28 +0800, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan <wenzong.fan@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@windriver.com>
> ---
> bitbake/lib/bb/providers.py | 2 ++
> bitbake/lib/bb/taskdata.py | 3 ++-
> 2 files changed, 4 insertions(+), 1 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-11 10:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-11 3:28 [PATCH 0/1] bitbake: Abort build if runtime dependency conflict wenzong.fan
2012-07-11 3:28 ` [PATCH 1/1] " wenzong.fan
2012-07-11 10:44 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.