diff options
| author |   Elliot Smith <elliot.smith@intel.com> | 2016-07-12 15:54:54 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-19 08:56:52 +0100 |
| commit | 2db40e377148c862161125a56bb3b9d5d2ed9a7c (patch) | |
| tree | 70b5ec7b437a13488061fd5a798a26268790a9d7 /bitbake/lib/bb/ui | |
| parent | 1027e0e313c4743a7ddb5e192013fba5d7ad0e1c (diff) | |
| download | openembedded-core-contrib-2db40e377148c862161125a56bb3b9d5d2ed9a7c.tar.gz | |
bitbake: toaster: add package manifest path to Target objects
Store the path to the *.rootfs.manifest file for targets which
generate images.
A link to the package manifest is displayed in the build dashboard
for targets which produce image files.
Like the license manifest path, if a target would have produced
the package manifest (but didn't, because it already existed), that
path is copied from the target which did produce the package
manifest.
(Bitbake rev: 79b8e349a0da2ea6b97ad82daa5837e6dfffe0af)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: bavery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
| -rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 52b5e12bff..91189f60ec 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py @@ -256,6 +256,10 @@ class ORMWrapper(object): target.license_manifest_path = license_manifest_path target.save() + def update_target_set_package_manifest(self, target, package_manifest_path): + target.package_manifest_path = package_manifest_path + target.save() + def update_task_object(self, build, task_name, recipe_name, task_stats): """ Find the task for build which matches the recipe and task name @@ -1597,7 +1601,7 @@ class BuildInfoHelper(object): machine = self.server.runCommand(['getVariable', 'MACHINE'])[0] image_name = self.server.runCommand(['getVariable', 'IMAGE_NAME'])[0] - # location of the image_license.manifest files for this build; + # location of the manifest files for this build; # note that this file is only produced if an image is produced license_directory = \ self.server.runCommand(['getVariable', 'LICENSE_DIRECTORY'])[0] @@ -1636,6 +1640,11 @@ class BuildInfoHelper(object): real_image_name, 'image_license.manifest') + image_package_manifest_path = os.path.join( + license_directory, + real_image_name, + 'image_license.manifest') + # if image_license.manifest exists, we can read the names of bzImage # and modules files for this build from it, then look for them # in the DEPLOY_DIR_IMAGE; note that this file is only produced @@ -1657,11 +1666,20 @@ class BuildInfoHelper(object): # store the license manifest path on the target # (this file is also created any time an image file is created) - license_path = os.path.join(license_directory, + license_manifest_path = os.path.join(license_directory, real_image_name, 'license.manifest') self.orm_wrapper.update_target_set_license_manifest( - image_target, license_path) + image_target, license_manifest_path) + + # store the package manifest path on the target (this file + # is created any time an image file is created) + package_manifest_path = os.path.join(deploy_dir_image, + real_image_name + '.rootfs.manifest') + + if os.path.exists(package_manifest_path): + self.orm_wrapper.update_target_set_package_manifest( + image_target, package_manifest_path) # scan the directory for image files relating to this build # (via real_image_name); note that we don't have to set |