summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui/templates/configvars.html
diff options
context:
space:
mode:
authorDave Lerner <dave.lerner@windriver.com>2015-03-11 15:05:08 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-25 12:39:51 +0000
commite1a5d8150032b884bd85fcb20de14cd14cfd2b92 (patch)
tree21424e5a3170c1b396d8a8bd8e15ee835a34b710 /bitbake/lib/toaster/toastergui/templates/configvars.html
parentfa595132b337861898b391229ef54fc5b451a148 (diff)
downloadpoky-e1a5d8150032b884bd85fcb20de14cd14cfd2b92.tar.gz
bitbake: toaster: layer-relative paths for config files
Change bitbake variables table to show the path to the file in which the variable was defined using a layer-relative path instead of the full path to the file. The layer-relative path is found by matching on the full defining file path with entries in a list of layer names, sorted in descending order, and with 'meta' appended as a built-in layer to the end of the list. Additional filters are used to reduce false matches, although even if there is a false match, the actual path to the defining file will be obvious and not misleading. [YOCTO #7414] (Bitbake rev: ef6e854a50ea6894b0e320025280431a6fc8a9a5) Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/configvars.html')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/configvars.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html
index 1bd29aac0d..3e4c7e85ea 100644
--- a/bitbake/lib/toaster/toastergui/templates/configvars.html
+++ b/bitbake/lib/toaster/toastergui/templates/configvars.html
@@ -55,7 +55,7 @@
55 <td class="variable_value"><a data-toggle="modal" href="#variable-{{variable.pk}}">{{variable.variable_value|truncatechars:153}}</a></td> 55 <td class="variable_value"><a data-toggle="modal" href="#variable-{{variable.pk}}">{{variable.variable_value|truncatechars:153}}</a></td>
56 <td class="file"><a data-toggle="modal" href="#variable-{{variable.pk}}"> 56 <td class="file"><a data-toggle="modal" href="#variable-{{variable.pk}}">
57 {% if variable.vhistory.all %} {% autoescape off %} 57 {% if variable.vhistory.all %} {% autoescape off %}
58 {{variable.vhistory.all | filter_setin_files:file_filter }} 58 {{variable.vhistory.all | filter_setin_files:file_filter | cut_layer_path_prefix:layer_names}}
59 {% endautoescape %} {% endif %} 59 {% endautoescape %} {% endif %}
60 </a></td> 60 </a></td>
61 <td class="description"> 61 <td class="description">
@@ -115,7 +115,7 @@
115 <tbody> 115 <tbody>
116 {% for vh in variable.vhistory.all %} 116 {% for vh in variable.vhistory.all %}
117 <tr> 117 <tr>
118 <td>{{forloop.counter}}</td><td>{{vh.file_name}}</td><td>{{vh.operation}}</td><td>{{vh.line_number}}</td> 118 <td>{{forloop.counter}}</td><td>{{vh.file_name|cut_layer_path_prefix:layer_names}}</td><td>{{vh.operation}}</td><td>{{vh.line_number}}</td>
119 </tr> 119 </tr>
120 {%endfor%} 120 {%endfor%}
121 </tbody> 121 </tbody>