summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-03-09 17:24:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:44:05 +0000
commite5590bc381e5f09a768bdcb367d21785864b4d2b (patch)
tree77cbf17b971c3d35992e4ac2844e70c751032f15 /bitbake
parentcffc2081cb0a2c6dcfe3730b68c1c20fbac0538d (diff)
downloadpoky-e5590bc381e5f09a768bdcb367d21785864b4d2b.tar.gz
bitbake: toastergui: fix project page layer branch names
Change inconsistent branch name usage in project page to the uniquely defined get_vcs_reference() [YOCTO #7381] (Bitbake rev: bc838a6c075c4d7e24f7820088f485bbfdea5a32) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/project.html2
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html
index 039601f476..06fc6a5b62 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/bitbake/lib/toaster/toastergui/templates/project.html
@@ -271,7 +271,7 @@ vim: expandtab tabstop=2
271 <div id="layer-container" class="well well-transparent span4"> 271 <div id="layer-container" class="well well-transparent span4">
272 <h3> 272 <h3>
273 Layers <span class="muted counter">({[layers.length]})</span> 273 Layers <span class="muted counter">({[layers.length]})</span>
274 <i class="icon-question-sign get-help heading-help" title="OpenEmbedded organises metadata into modules called 'layers'. Layers allow you to isolate different types of customizations from each other. <a href='http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#understanding-and-creating-layers' target='_blank'>More on layers</a>"></i> 274 <i class="icon-question-sign get-help heading-help" title="Bitbake reads metadata files from modules called 'layers'. Layers allow you to isolate different types of customizations from each other. <a href='http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#understanding-and-creating-layers' target='_blank'>More on layers</a>"></i>
275 </h3> 275 </h3>
276 <div class="alert" ng-if="!layers.length"> 276 <div class="alert" ng-if="!layers.length">
277 <b>You need to add some layers </b> 277 <b>You need to add some layers </b>
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index a07f720543..9f0bb993e6 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2135,7 +2135,7 @@ if toastermain.settings.MANAGED:
2135 "url": x.layercommit.layer.layer_index_url, 2135 "url": x.layercommit.layer.layer_index_url,
2136 "layerdetailurl": reverse("layerdetails", args=(x.layercommit.pk,)), 2136 "layerdetailurl": reverse("layerdetails", args=(x.layercommit.pk,)),
2137 # This branch name is actually the release 2137 # This branch name is actually the release
2138 "branch" : { "name" : x.layercommit.commit, "layersource" : x.layercommit.up_branch.layer_source.name if x.layercommit.up_branch != None else None}}, 2138 "branch" : { "name" : x.layercommit.get_vcs_reference(), "layersource" : x.layercommit.up_branch.layer_source.name if x.layercommit.up_branch != None else None}},
2139 prj.projectlayer_set.all().order_by("id")), 2139 prj.projectlayer_set.all().order_by("id")),
2140 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()), 2140 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()),
2141 "freqtargets": freqtargets, 2141 "freqtargets": freqtargets,
@@ -2257,7 +2257,7 @@ if toastermain.settings.MANAGED:
2257 # return all project settings 2257 # return all project settings
2258 return HttpResponse(jsonfilter( { 2258 return HttpResponse(jsonfilter( {
2259 "error": "ok", 2259 "error": "ok",
2260 "layers" : map(lambda x: {"id": x.layercommit.pk, "orderid" : x.pk, "name" : x.layercommit.layer.name, "giturl" : x.layercommit.layer.vcs_url, "url": x.layercommit.layer.layer_index_url, "layerdetailurl": reverse("layerdetails", args=(x.layercommit.layer.pk,)), "branch" : { "name" : x.layercommit.up_branch.name, "layersource" : x.layercommit.up_branch.layer_source.name}}, prj.projectlayer_set.all().select_related("layer").order_by("id")), 2260 "layers" : map(lambda x: {"id": x.layercommit.pk, "orderid" : x.pk, "name" : x.layercommit.layer.name, "giturl" : x.layercommit.layer.vcs_url, "url": x.layercommit.layer.layer_index_url, "layerdetailurl": reverse("layerdetails", args=(x.layercommit.layer.pk,)), "branch" : { "name" : x.layercommit.get_vcs_reference(), "layersource" : x.layercommit.up_branch.layer_source.name}}, prj.projectlayer_set.all().select_related("layer").order_by("id")),
2261 "builds" : _project_recent_build_list(prj), 2261 "builds" : _project_recent_build_list(prj),
2262 "variables": map(lambda x: (x.name, x.value), prj.projectvariable_set.all()), 2262 "variables": map(lambda x: (x.name, x.value), prj.projectvariable_set.all()),
2263 "machine": {"name": prj.projectvariable_set.get(name="MACHINE").value}, 2263 "machine": {"name": prj.projectvariable_set.get(name="MACHINE").value},