summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2018-10-15 00:14:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-18 10:59:26 +0100
commit089f5dfc2a7ee0b689a36ea9a2221d420e6b0b4f (patch)
tree5542ecb352a4c739220c98e4dec89b59ac4292fe /bitbake/lib/toaster
parenta9aa1d24c7c4518173f622a1fab55a98a16150f9 (diff)
downloadpoky-089f5dfc2a7ee0b689a36ea9a2221d420e6b0b4f.tar.gz
bitbake: toaster: bad link for distro conf file
The distro source path link is missing "conf/distro/", and the display is using the machine link instead of the distro link. [YOCTO #12957] (Bitbake rev: e43ff061b03878057e49c44aa3ee2e4c7a5d5503) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r--bitbake/lib/toaster/orm/models.py2
-rw-r--r--bitbake/lib/toaster/toastergui/tables.py8
2 files changed, 4 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 849c22eede..7720290214 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1877,7 +1877,7 @@ class Distro(models.Model):
1877 description = models.CharField(max_length=255) 1877 description = models.CharField(max_length=255)
1878 1878
1879 def get_vcs_distro_file_link_url(self): 1879 def get_vcs_distro_file_link_url(self):
1880 path = self.name+'.conf' 1880 path = 'conf/distro/%s.conf' % self.name
1881 return self.layer_version.get_vcs_file_link_url(path) 1881 return self.layer_version.get_vcs_file_link_url(path)
1882 1882
1883 def __unicode__(self): 1883 def __unicode__(self):
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index 03bd2ae9c6..9ff756bc8d 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -1615,14 +1615,12 @@ class DistrosTable(ToasterTable):
1615 hidden=True, 1615 hidden=True,
1616 field_name="layer_version__get_vcs_reference") 1616 field_name="layer_version__get_vcs_reference")
1617 1617
1618 wrtemplate_file_template = '''<code>conf/machine/{{data.name}}.conf</code> 1618 distro_file_template = '''<code>conf/distro/{{data.name}}.conf</code>
1619 <a href="{{data.get_vcs_machine_file_link_url}}" target="_blank"><span class="glyphicon glyphicon-new-window"></i></a>''' 1619 {% if 'None' not in data.get_vcs_distro_file_link_url %}<a href="{{data.get_vcs_distro_file_link_url}}" target="_blank"><span class="glyphicon glyphicon-new-window"></i></a>{% endif %}'''
1620
1621 self.add_column(title="Distro file", 1620 self.add_column(title="Distro file",
1622 hidden=True, 1621 hidden=True,
1623 static_data_name="templatefile", 1622 static_data_name="templatefile",
1624 static_data_template=wrtemplate_file_template) 1623 static_data_template=distro_file_template)
1625
1626 1624
1627 self.add_column(title="Select", 1625 self.add_column(title="Select",
1628 help_text="Sets the selected distro to the project", 1626 help_text="Sets the selected distro to the project",