mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toaster: bad link for distro conf file

Browse Source 
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>
This commit is contained in:
David Reyna
2018-10-15 00:14:17 -07:00
committed by Richard Purdie
parent a9aa1d24c7
commit 089f5dfc2a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/orm/models.py
+1 -1
View File
@@ -1877,7 +1877,7 @@ class Distro(models.Model):
description = models.CharField(max_length=255) description = models.CharField(max_length=255)
def get_vcs_distro_file_link_url(self): def get_vcs_distro_file_link_url(self):
path = self.name+'.conf' path = 'conf/distro/%s.conf' % self.name
return self.layer_version.get_vcs_file_link_url(path) return self.layer_version.get_vcs_file_link_url(path)
def __unicode__(self): def __unicode__(self):
bitbake/lib/toaster/toastergui/tables.py
+3 -5
View File
@@ -1615,14 +1615,12 @@ class DistrosTable(ToasterTable):
hidden=True, hidden=True,
field_name="layer_version__get_vcs_reference") field_name="layer_version__get_vcs_reference")
wrtemplate_file_template = '''<code>conf/machine/{{data.name}}.conf</code> distro_file_template = '''<code>conf/distro/{{data.name}}.conf</code>
<a href="{{data.get_vcs_machine_file_link_url}}" target="_blank"><span class="glyphicon glyphicon-new-window"></i></a>''' {% 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 %}'''
self.add_column(title="Distro file", self.add_column(title="Distro file",
hidden=True, hidden=True,
static_data_name="templatefile", static_data_name="templatefile",
static_data_template=wrtemplate_file_template) static_data_template=distro_file_template)
self.add_column(title="Select", self.add_column(title="Select",
help_text="Sets the selected distro to the project", help_text="Sets the selected distro to the project",