summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2014-03-18 18:27:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-25 11:17:34 +0000
commit9e376dbed292410df2188d58ea5bc1f4cfaafa4e (patch)
tree2666b10a88cf11a32b795005458b5e5e7371b205
parent2d4199ba8c236980765f73f34fde05707cc417ff (diff)
downloadpoky-9e376dbed292410df2188d58ea5bc1f4cfaafa4e.tar.gz
bitbake: bitbake toaster: check the file_name with the content of the IMAGE_FSTYPES variable
File_name information of Target_image_file is being collected for a .rootfs.manifest file. We would like not to collect this. The solution is to cross check the information gathered for file_name with the content of the IMAGE_FSTYPES variable. If any of the file_name entries does not match the content of IMAGE_FSTYPES, we do not store it. [YOCTO #5189] (Bitbake rev: 017771ed0508b247edaf875789260906f44381f4) 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>
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 08d9fcf8b3..30c9b92395 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -615,11 +615,12 @@ class BuildInfoHelper(object):
615 self.orm_wrapper.save_build_variables(build_obj, self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0]) 615 self.orm_wrapper.save_build_variables(build_obj, self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0])
616 616
617 def update_target_image_file(self, event): 617 def update_target_image_file(self, event):
618 image_fstypes = self.server.runCommand(["getVariable", "IMAGE_FSTYPES"])[0]
618 for t in self.internal_state['targets']: 619 for t in self.internal_state['targets']:
619 if t.is_image == True: 620 if t.is_image == True:
620 output_files = list(event.data.viewkeys()) 621 output_files = list(event.data.viewkeys())
621 for output in output_files: 622 for output in output_files:
622 if t.target in output: 623 if t.target in output and output.split('.rootfs.')[1] in image_fstypes:
623 self.orm_wrapper.save_target_image_file_information(t, output, event.data[output]) 624 self.orm_wrapper.save_target_image_file_information(t, output, event.data[output])
624 625
625 def update_build_information(self, event, errors, warnings, taskfailures): 626 def update_build_information(self, event, errors, warnings, taskfailures):