diff options
Diffstat (limited to 'bitbake/lib/toaster')
4 files changed, 33 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): |
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 32212ea8d4..36c28b7d6a 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html | |||
@@ -90,6 +90,12 @@ | |||
90 | <dd> | 90 | <dd> |
91 | <a href="{% url 'build_artifact' build.pk 'licensemanifest' target.target.pk %}">License manifest</a> | 91 | <a href="{% url 'build_artifact' build.pk 'licensemanifest' target.target.pk %}">License manifest</a> |
92 | </dd> | 92 | </dd> |
93 | |||
94 | {% if target.target.package_manifest_path %} | ||
95 | <dd> | ||
96 | <a href="{% url 'build_artifact' build.pk 'packagemanifest' target.target.pk %}">Package manifest</a> | ||
97 | </dd> | ||
98 | {% endif %} | ||
93 | </dl> | 99 | </dl> |
94 | 100 | ||
95 | <dl class="dl-horizontal"> | 101 | <dl class="dl-horizontal"> |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index baaa2883bc..aab6536fa0 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -2315,6 +2315,9 @@ if True: | |||
2315 | elif artifact_type == "licensemanifest": | 2315 | elif artifact_type == "licensemanifest": |
2316 | file_name = Target.objects.get(build = build, pk = artifact_id).license_manifest_path | 2316 | file_name = Target.objects.get(build = build, pk = artifact_id).license_manifest_path |
2317 | 2317 | ||
2318 | elif artifact_type == "packagemanifest": | ||
2319 | file_name = Target.objects.get(build = build, pk = artifact_id).package_manifest_path | ||
2320 | |||
2318 | elif artifact_type == "tasklogfile": | 2321 | elif artifact_type == "tasklogfile": |
2319 | file_name = Task.objects.get(build = build, pk = artifact_id).logfile | 2322 | file_name = Task.objects.get(build = build, pk = artifact_id).logfile |
2320 | 2323 | ||