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/toaster/orm | |
parent | 1027e0e313c4743a7ddb5e192013fba5d7ad0e1c (diff) | |
download | poky-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/toaster/orm')
-rw-r--r-- | bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py | 19 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 8 |
2 files changed, 24 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py b/bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py new file mode 100644 index 0000000000..c958f3070d --- /dev/null +++ b/bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py | |||
@@ -0,0 +1,19 @@ | |||
1 | # -*- coding: utf-8 -*- | ||
2 | from __future__ import unicode_literals | ||
3 | |||
4 | from django.db import migrations, models | ||
5 | |||
6 | |||
7 | class Migration(migrations.Migration): | ||
8 | |||
9 | dependencies = [ | ||
10 | ('orm', '0008_refactor_artifact_models'), | ||
11 | ] | ||
12 | |||
13 | operations = [ | ||
14 | migrations.AddField( | ||
15 | model_name='target', | ||
16 | name='package_manifest_path', | ||
17 | field=models.CharField(null=True, max_length=500), | ||
18 | ), | ||
19 | ] | ||
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index a1119168dd..8e40f0aca2 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -622,6 +622,7 @@ class Target(models.Model): | |||
622 | is_image = models.BooleanField(default = False) | 622 | is_image = models.BooleanField(default = False) |
623 | image_size = models.IntegerField(default=0) | 623 | image_size = models.IntegerField(default=0) |
624 | license_manifest_path = models.CharField(max_length=500, null=True) | 624 | license_manifest_path = models.CharField(max_length=500, null=True) |
625 | package_manifest_path = models.CharField(max_length=500, null=True) | ||
625 | 626 | ||
626 | def package_count(self): | 627 | def package_count(self): |
627 | return Target_Installed_Package.objects.filter(target_id__exact=self.id).count() | 628 | return Target_Installed_Package.objects.filter(target_id__exact=self.id).count() |
@@ -729,9 +730,9 @@ class Target(models.Model): | |||
729 | Target_Image_File object for an ext4 image being associated with a | 730 | Target_Image_File object for an ext4 image being associated with a |
730 | target for a project which didn't produce an ext4 image (for example). | 731 | target for a project which didn't produce an ext4 image (for example). |
731 | 732 | ||
732 | Also sets the license_manifest_path of this target to the same path | 733 | Also sets the license_manifest_path and package_manifest_path |
733 | as that of target being cloned from, as the license manifest path is | 734 | of this target to the same path as that of target being cloned from, as |
734 | also a build artifact but is treated differently. | 735 | the manifests are also build artifacts but are treated differently. |
735 | """ | 736 | """ |
736 | 737 | ||
737 | image_fstypes = self.build.get_image_fstypes() | 738 | image_fstypes = self.build.get_image_fstypes() |
@@ -754,6 +755,7 @@ class Target(models.Model): | |||
754 | kernel_file.save() | 755 | kernel_file.save() |
755 | 756 | ||
756 | self.license_manifest_path = target.license_manifest_path | 757 | self.license_manifest_path = target.license_manifest_path |
758 | self.package_manifest_path = target.package_manifest_path | ||
757 | self.save() | 759 | self.save() |
758 | 760 | ||
759 | def clone_sdk_artifacts_from(self, target): | 761 | def clone_sdk_artifacts_from(self, target): |