diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2014-03-12 18:47:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-14 07:18:46 -0700 |
commit | 839f30486e82710b54deaa979bf69390013ec8b6 (patch) | |
tree | fa8b05426616274e4467f8776ae27fb33d196a1b /bitbake/lib/bb | |
parent | a3eb7da31c998ae202717a91917954e98cbf8eb8 (diff) | |
download | poky-839f30486e82710b54deaa979bf69390013ec8b6.tar.gz |
bitbake: toaster: populate target image file table
Using ImageFileSize Metadata event, the image output file and its
size are populated into target_image_file table.
[YOCTO #5189]
[YOCTO #5228]
(Bitbake rev: a0b06d362b9aa08fda293489467af343c6ca6de4)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@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.py | 13 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/toasterui.py | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index f9b067fab9..1b17c1f6e3 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -26,6 +26,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toaster.toastermain.settings") | |||
26 | 26 | ||
27 | import toaster.toastermain.settings as toaster_django_settings | 27 | import toaster.toastermain.settings as toaster_django_settings |
28 | from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage | 28 | from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage |
29 | from toaster.orm.models import Target_Image_File | ||
29 | from toaster.orm.models import Variable, VariableHistory | 30 | from toaster.orm.models import Variable, VariableHistory |
30 | from toaster.orm.models import Package, Package_File, Target_Installed_Package, Target_File | 31 | from toaster.orm.models import Package, Package_File, Target_Installed_Package, Target_File |
31 | from toaster.orm.models import Task_Dependency, Package_Dependency | 32 | from toaster.orm.models import Task_Dependency, Package_Dependency |
@@ -344,6 +345,11 @@ class ORMWrapper(object): | |||
344 | if (len(errormsg) > 0): | 345 | if (len(errormsg) > 0): |
345 | raise Exception(errormsg) | 346 | raise Exception(errormsg) |
346 | 347 | ||
348 | def save_target_image_file_information(self, target_obj, file_name, file_size): | ||
349 | target_image_file = Target_Image_File.objects.create( target = target_obj, | ||
350 | file_name = file_name, | ||
351 | file_size = file_size) | ||
352 | target_image_file.save() | ||
347 | 353 | ||
348 | def create_logmessage(self, log_information): | 354 | def create_logmessage(self, log_information): |
349 | assert 'build' in log_information | 355 | assert 'build' in log_information |
@@ -598,6 +604,13 @@ class BuildInfoHelper(object): | |||
598 | # Save build configuration | 604 | # Save build configuration |
599 | self.orm_wrapper.save_build_variables(build_obj, self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0]) | 605 | self.orm_wrapper.save_build_variables(build_obj, self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0]) |
600 | 606 | ||
607 | def update_target_image_file(self, event): | ||
608 | for t in self.internal_state['targets']: | ||
609 | if t.is_image == True: | ||
610 | output_files = list(event.data.viewkeys()) | ||
611 | for output in output_files: | ||
612 | if t.target in output: | ||
613 | self.orm_wrapper.save_target_image_file_information(t, output, event.data[output]) | ||
601 | 614 | ||
602 | def update_build_information(self, event, errors, warnings, taskfailures): | 615 | def update_build_information(self, event, errors, warnings, taskfailures): |
603 | if 'build' in self.internal_state: | 616 | if 'build' in self.internal_state: |
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py index e469d93e82..04e0f99342 100644 --- a/bitbake/lib/bb/ui/toasterui.py +++ b/bitbake/lib/bb/ui/toasterui.py | |||
@@ -241,6 +241,8 @@ def main(server, eventHandler, params ): | |||
241 | buildinfohelper.store_tasks_stats(event) | 241 | buildinfohelper.store_tasks_stats(event) |
242 | if event.type == "ImagePkgList": | 242 | if event.type == "ImagePkgList": |
243 | buildinfohelper.store_target_package_data(event) | 243 | buildinfohelper.store_target_package_data(event) |
244 | elif event.type == "ImageFileSize": | ||
245 | buildinfohelper.update_target_image_file(event) | ||
244 | continue | 246 | continue |
245 | 247 | ||
246 | # ignore | 248 | # ignore |