[Toaster] [PATCH 2/6] event: add new parameter to Build* event APIs
Ed Bartosh
ed.bartosh at linux.intel.com
Tue Sep 29 00:55:29 PDT 2015
Added 't'(task) parameter to BuildStarted and BuildCompleted
event APIs. Modified existing calls of above mentioned APIs:
passed bitbake task name as a parameter.
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
bitbake/lib/bb/cooker.py | 8 ++++----
bitbake/lib/bb/event.py | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a0d7d59..ef81c3a 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1313,7 +1313,7 @@ class BBCooker:
taskdata.add_provider(self.data, self.recipecache, item)
buildname = self.data.getVar("BUILDNAME", True)
- bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.expanded_data)
+ bb.event.fire(bb.event.BuildStarted(buildname, [item], task), self.expanded_data)
# Execute the runqueue
if not task.startswith("do_"):
@@ -1345,7 +1345,7 @@ class BBCooker:
return False
if not retval:
- bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, failures, interrupted), self.expanded_data)
+ bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, task, failures, interrupted), self.expanded_data)
self.command.finishAsyncCommand(msg)
return False
if retval is True:
@@ -1381,7 +1381,7 @@ class BBCooker:
return False
if not retval:
- bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, failures, interrupted), self.data)
+ bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, task, failures, interrupted), self.data)
self.command.finishAsyncCommand(msg)
return False
if retval is True:
@@ -1394,7 +1394,7 @@ class BBCooker:
taskdata, runlist, fulltargetlist = self.buildTaskData(targets, task, self.configuration.abort)
buildname = self.data.getVar("BUILDNAME", False)
- bb.event.fire(bb.event.BuildStarted(buildname, fulltargetlist), self.data)
+ bb.event.fire(bb.event.BuildStarted(buildname, fulltargetlist, task), self.data)
rq = bb.runqueue.RunQueue(self, self.data, self.recipecache, taskdata, runlist)
if 'universe' in targets:
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 68496e5..bf67ee9 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -328,10 +328,10 @@ class StampUpdate(Event):
class BuildBase(Event):
"""Base class for bbmake run events"""
- def __init__(self, n, p, failures = 0):
+ def __init__(self, n, p, t, failures = 0):
self._name = n
self._pkgs = p
- self._task = None
+ self._task = t
Event.__init__(self)
self._failures = failures
@@ -376,19 +376,19 @@ class BuildBase(Event):
class BuildStarted(BuildBase, OperationStarted):
"""bbmake build run started"""
- def __init__(self, n, p, failures = 0):
+ def __init__(self, n, p, t, failures = 0):
OperationStarted.__init__(self, "Building Started")
- BuildBase.__init__(self, n, p, failures)
+ BuildBase.__init__(self, n, p, t, failures)
class BuildCompleted(BuildBase, OperationCompleted):
"""bbmake build run completed"""
- def __init__(self, total, n, p, failures=0, interrupted=0):
+ def __init__(self, total, n, p, t, failures=0, interrupted=0):
if not failures:
OperationCompleted.__init__(self, total, "Building Succeeded")
else:
OperationCompleted.__init__(self, total, "Building Failed")
self._interrupted = interrupted
- BuildBase.__init__(self, n, p, failures)
+ BuildBase.__init__(self, n, p, t, failures)
class DiskFull(Event):
"""Disk full case build aborted"""
--
2.1.4
More information about the toaster
mailing list