summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2014-03-12 18:47:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-14 07:18:46 -0700
commit5396191fed7921c6d0762ba71f182ce2d0174686 (patch)
tree7ebda383ba91691d16cf71bddc4b856120ecf091 /bitbake/lib/bb
parent839f30486e82710b54deaa979bf69390013ec8b6 (diff)
downloadpoky-5396191fed7921c6d0762ba71f182ce2d0174686.tar.gz
bitbake: toaster: add license manifest path to database
Based on image_name, the target is obtained, and the path is added to the database. [YOCTO #5649] (Bitbake rev: 911b5191133956c30d53f57629c115db196b9ac8) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py14
-rw-r--r--bitbake/lib/bb/ui/toasterui.py8
2 files changed, 19 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 1b17c1f6e3..8f091e8990 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -93,6 +93,10 @@ class ORMWrapper(object):
93 build.outcome = outcome 93 build.outcome = outcome
94 build.save() 94 build.save()
95 95
96 def update_target_object(self, target, license_manifest_path):
97
98 target.license_manifest_path = license_manifest_path
99 target.save()
96 100
97 def get_update_task_object(self, task_information, must_exist = False): 101 def get_update_task_object(self, task_information, must_exist = False):
98 assert 'build' in task_information 102 assert 'build' in task_information
@@ -616,6 +620,16 @@ class BuildInfoHelper(object):
616 if 'build' in self.internal_state: 620 if 'build' in self.internal_state:
617 self.orm_wrapper.update_build_object(self.internal_state['build'], errors, warnings, taskfailures) 621 self.orm_wrapper.update_build_object(self.internal_state['build'], errors, warnings, taskfailures)
618 622
623
624 def store_license_manifest_path(self, event):
625 deploy_dir = event.data['deploy_dir_image']
626 image_name = event.data['image_name']
627 path = deploy_dir + "/licenses/" + image_name + "/"
628 for target in self.internal_state['targets']:
629 if target.target in image_name:
630 self.orm_wrapper.update_target_object(target, path)
631
632
619 def store_started_task(self, event): 633 def store_started_task(self, event):
620 assert isinstance(event, (bb.runqueue.sceneQueueTaskStarted, bb.runqueue.runQueueTaskStarted, bb.runqueue.runQueueTaskSkipped)) 634 assert isinstance(event, (bb.runqueue.sceneQueueTaskStarted, bb.runqueue.runQueueTaskStarted, bb.runqueue.runQueueTaskSkipped))
621 assert 'taskfile' in vars(event) 635 assert 'taskfile' in vars(event)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 04e0f99342..b2c084cb8e 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -235,14 +235,16 @@ def main(server, eventHandler, params ):
235 if isinstance(event, bb.event.MetadataEvent): 235 if isinstance(event, bb.event.MetadataEvent):
236 if event.type == "SinglePackageInfo": 236 if event.type == "SinglePackageInfo":
237 buildinfohelper.store_build_package_information(event) 237 buildinfohelper.store_build_package_information(event)
238 if event.type == "LayerInfo": 238 elif event.type == "LayerInfo":
239 buildinfohelper.store_layer_info(event) 239 buildinfohelper.store_layer_info(event)
240 if event.type == "BuildStatsList": 240 elif event.type == "BuildStatsList":
241 buildinfohelper.store_tasks_stats(event) 241 buildinfohelper.store_tasks_stats(event)
242 if event.type == "ImagePkgList": 242 elif event.type == "ImagePkgList":
243 buildinfohelper.store_target_package_data(event) 243 buildinfohelper.store_target_package_data(event)
244 elif event.type == "ImageFileSize": 244 elif event.type == "ImageFileSize":
245 buildinfohelper.update_target_image_file(event) 245 buildinfohelper.update_target_image_file(event)
246 elif event.type == "LicenseManifestPath":
247 buildinfohelper.store_license_manifest_path(event)
246 continue 248 continue
247 249
248 # ignore 250 # ignore