[bitbake-devel] [PATCH 2/4] toaster: add license manifest path to database
Alex DAMIAN
alexandru.damian at intel.com
Wed Mar 12 18:47:40 UTC 2014
From: Cristiana Voicu <cristiana.voicu at intel.com>
Based on image_name, the target is obtained, and the path
is added to the database.
[YOCTO #5649]
Signed-off-by: Cristiana Voicu <cristiana.voicu at intel.com>
---
lib/bb/ui/buildinfohelper.py | 14 ++++++++++++++
lib/bb/ui/toasterui.py | 8 +++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 1b17c1f..8f091e8 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/lib/bb/ui/buildinfohelper.py
@@ -93,6 +93,10 @@ class ORMWrapper(object):
build.outcome = outcome
build.save()
+ def update_target_object(self, target, license_manifest_path):
+
+ target.license_manifest_path = license_manifest_path
+ target.save()
def get_update_task_object(self, task_information, must_exist = False):
assert 'build' in task_information
@@ -616,6 +620,16 @@ class BuildInfoHelper(object):
if 'build' in self.internal_state:
self.orm_wrapper.update_build_object(self.internal_state['build'], errors, warnings, taskfailures)
+
+ def store_license_manifest_path(self, event):
+ deploy_dir = event.data['deploy_dir_image']
+ image_name = event.data['image_name']
+ path = deploy_dir + "/licenses/" + image_name + "/"
+ for target in self.internal_state['targets']:
+ if target.target in image_name:
+ self.orm_wrapper.update_target_object(target, path)
+
+
def store_started_task(self, event):
assert isinstance(event, (bb.runqueue.sceneQueueTaskStarted, bb.runqueue.runQueueTaskStarted, bb.runqueue.runQueueTaskSkipped))
assert 'taskfile' in vars(event)
diff --git a/lib/bb/ui/toasterui.py b/lib/bb/ui/toasterui.py
index 04e0f99..b2c084c 100644
--- a/lib/bb/ui/toasterui.py
+++ b/lib/bb/ui/toasterui.py
@@ -235,14 +235,16 @@ def main(server, eventHandler, params ):
if isinstance(event, bb.event.MetadataEvent):
if event.type == "SinglePackageInfo":
buildinfohelper.store_build_package_information(event)
- if event.type == "LayerInfo":
+ elif event.type == "LayerInfo":
buildinfohelper.store_layer_info(event)
- if event.type == "BuildStatsList":
+ elif event.type == "BuildStatsList":
buildinfohelper.store_tasks_stats(event)
- if event.type == "ImagePkgList":
+ elif event.type == "ImagePkgList":
buildinfohelper.store_target_package_data(event)
elif event.type == "ImageFileSize":
buildinfohelper.update_target_image_file(event)
+ elif event.type == "LicenseManifestPath":
+ buildinfohelper.store_license_manifest_path(event)
continue
# ignore
--
1.8.3.2
More information about the bitbake-devel
mailing list