summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-05-14 16:10:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 11:59:43 +0100
commite3e85bdf7100cc5619d7f184dc8d9e2a77a03364 (patch)
treea3dcc4abf6973288c0001e7498f8270d6fccdb7e /bitbake/lib/toaster/toastergui
parenta5236be47fd62d41eaea2d4b4f1a394de0aac4a9 (diff)
downloadpoky-e3e85bdf7100cc5619d7f184dc8d9e2a77a03364.tar.gz
bitbake: toaster logger: refactor recipe and layer file paths
This refactoring brings the "local_path" of the layer from the Layer object to the Layer_Version object, which is more appropriate as different checkouts of the same Layer may live in different directories. This enables us to store Recipe file paths relative to a Layer_Version at all times, aleviating the need to store full file paths in the database. We also turn the prefix of the path (e.g. virtual:native path name space) into a pathflag field. In turn, this solves the problem of mis-identification of tasks based on the recipe file paths, since we can also match the namespace of the file paths on the recipe files. [YOCTO #7594] (Bitbake rev: ec43dc569e370767c709dec225cbee0c99151c19) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/bpackage.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/configuration.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/package_detail_base.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipe.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipes.html4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/target.html2
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py22
7 files changed, 20 insertions, 20 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/bitbake/lib/toaster/toastergui/templates/bpackage.html
index 6fbdc7b92d..1c47354a99 100644
--- a/bitbake/lib/toaster/toastergui/templates/bpackage.html
+++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html
@@ -89,7 +89,7 @@
89 </td> 89 </td>
90 <!-- Layer directory --> 90 <!-- Layer directory -->
91 {% if not MANAGED or not build.project %} 91 {% if not MANAGED or not build.project %}
92 <td class="recipe__layer_version__layer__local_path">{{package.recipe.layer_version.layer.local_path}}</td> 92 <td class="recipe__layer_version__local_path">{{package.recipe.layer_version.local_path}}</td>
93 {% endif %} 93 {% endif %}
94 {%else%} 94 {%else%}
95 <td class="recipe__name"></td> 95 <td class="recipe__name"></td>
@@ -97,7 +97,7 @@
97 <td class="recipe__layer_version__layer__name"></td> 97 <td class="recipe__layer_version__layer__name"></td>
98 <td class="recipe__layer_version__branch"></td> 98 <td class="recipe__layer_version__branch"></td>
99 <td class="recipe__layer_version__layer__commit"></td> 99 <td class="recipe__layer_version__layer__commit"></td>
100 <td class="recipe__layer_version__layer__local_path"></td> 100 <td class="recipe__layer_version__local_path"></td>
101 {%endif%} 101 {%endif%}
102 102
103 </tr> 103 </tr>
diff --git a/bitbake/lib/toaster/toastergui/templates/configuration.html b/bitbake/lib/toaster/toastergui/templates/configuration.html
index d3b34a2096..2aa1ae1a49 100644
--- a/bitbake/lib/toaster/toastergui/templates/configuration.html
+++ b/bitbake/lib/toaster/toastergui/templates/configuration.html
@@ -64,7 +64,7 @@
64 {{lv.commit|truncatechars:13}} 64 {{lv.commit|truncatechars:13}}
65 </a></td> 65 </a></td>
66 {% if not MANAGED or not build.project %} 66 {% if not MANAGED or not build.project %}
67 <td>{{lv.layer.local_path}}</td> 67 <td>{{lv.local_path}}</td>
68 {% endif %} 68 {% endif %}
69 </tr>{% endfor %} 69 </tr>{% endfor %}
70 </tbody> 70 </tbody>
diff --git a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
index ad75454310..e2ec75d157 100644
--- a/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
+++ b/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
@@ -141,7 +141,7 @@
141 Layer directory 141 Layer directory
142 <i class="icon-question-sign get-help" title="Path to the layer providing the recipe that builds this package"></i> 142 <i class="icon-question-sign get-help" title="Path to the layer providing the recipe that builds this package"></i>
143 </dt> 143 </dt>
144 <dd><code>{{package.recipe.layer_version.layer.local_path}}</code></dd> 144 <dd><code>{{package.recipe.layer_version.local_path}}</code></dd>
145 {% endif %} 145 {% endif %}
146 </dl> 146 </dl>
147 </div> <!-- row4 well --> 147 </div> <!-- row4 well -->
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html
index a0fe6d71d3..2da41c3085 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -58,13 +58,13 @@
58 <i class="icon-question-sign get-help" title="Path to the layer providing the recipe"></i> 58 <i class="icon-question-sign get-help" title="Path to the layer providing the recipe"></i>
59 Layer directory 59 Layer directory
60 </dt> 60 </dt>
61 <dd><code>{{layer.local_path}}</code></dd> 61 <dd><code>{{object.layer_version.local_path}}</code></dd>
62 {% endif %} 62 {% endif %}
63 <dt> 63 <dt>
64 <i class="icon-question-sign get-help" title="Path to the recipe .bb file"></i> 64 <i class="icon-question-sign get-help" title="Path to the recipe .bb file"></i>
65 Recipe file 65 Recipe file
66 </dt> 66 </dt>
67 <dd><code>{{object.get_local_path}}</code></dd> 67 <dd><code>{{object.file_path}} {% if object.pathflags %}<i>({{object.pathflags}})</i>{% endif %}</code></dd>
68 {% if layer_version.branch %} 68 {% if layer_version.branch %}
69 <dt> 69 <dt>
70 <i class="icon-question-sign get-help" title="The Git branch of the layer providing the recipe"></i> 70 <i class="icon-question-sign get-help" title="The Git branch of the layer providing the recipe"></i>
diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html
index dc2d9e8c3a..8d4494e7ef 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipes.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipes.html
@@ -84,7 +84,7 @@
84 {% endwith %} 84 {% endwith %}
85 </td> 85 </td>
86 <!-- Recipe file --> 86 <!-- Recipe file -->
87 <td class="recipe_file">{{recipe.get_local_path}}</td> 87 <td class="recipe_file">{{recipe.file_path}} {% if recipe.pathflags %}<i>({{recipe.pathflags}})</i>{% endif %}</td>
88 <!-- Section --> 88 <!-- Section -->
89 <td class="recipe_section">{{recipe.section}}</td> 89 <td class="recipe_section">{{recipe.section}}</td>
90 <!-- License --> 90 <!-- License -->
@@ -105,7 +105,7 @@
105 105
106 {% if not MANAGED or not build.project %} 106 {% if not MANAGED or not build.project %}
107 <!-- Layer directory --> 107 <!-- Layer directory -->
108 <td class="layer_version__layer__local_path">{{recipe.layer_version.layer.local_path}}</td> 108 <td class="layer_version__local_path">{{recipe.layer_version.local_path}}</td>
109 {% endif %} 109 {% endif %}
110 </tr> 110 </tr>
111 111
diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html
index 1309b52dad..e7febaf22a 100644
--- a/bitbake/lib/toaster/toastergui/templates/target.html
+++ b/bitbake/lib/toaster/toastergui/templates/target.html
@@ -154,7 +154,7 @@
154 </td> 154 </td>
155 {% if not MANAGED or not build.project %} 155 {% if not MANAGED or not build.project %}
156 <td class="layer_directory"> 156 <td class="layer_directory">
157 {{ package.recipe.layer_version.layer.local_path }} 157 {{ package.recipe.layer_version.local_path }}
158 </td> 158 </td>
159 {% endif %} 159 {% endif %}
160 </tr> 160 </tr>
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index c16fc2219f..761bf53a11 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -725,9 +725,9 @@ eans multiple licenses exist that cover different parts of the source',
725 tc_layerDir = { 725 tc_layerDir = {
726 'name':'Layer directory', 726 'name':'Layer directory',
727 'qhelp':'Location in disk of the layer providing the recipe that builds the package', 727 'qhelp':'Location in disk of the layer providing the recipe that builds the package',
728 'orderfield' : _get_toggle_order( request, "recipe__layer_version__layer__local_path" ), 728 'orderfield' : _get_toggle_order( request, "recipe__layer_version__local_path" ),
729 'ordericon' : _get_toggle_order_icon( request, "recipe__layer_version__layer__local_path" ), 729 'ordericon' : _get_toggle_order_icon( request, "recipe__layer_version__local_path" ),
730 'orderkey' : "recipe__layer_version__layer__local_path", 730 'orderkey' : "recipe__layer_version__local_path",
731 'clclass' : 'layer_directory', 731 'clclass' : 'layer_directory',
732 'hidden' : 1, 732 'hidden' : 1,
733 } 733 }
@@ -1254,10 +1254,10 @@ def recipes(request, build_id):
1254 { 1254 {
1255 'name':'Layer directory', 1255 'name':'Layer directory',
1256 'qhelp':'Path to the layer prodiving the recipe', 1256 'qhelp':'Path to the layer prodiving the recipe',
1257 'orderfield': _get_toggle_order(request, "layer_version__layer__local_path"), 1257 'orderfield': _get_toggle_order(request, "layer_version__local_path"),
1258 'ordericon':_get_toggle_order_icon(request, "layer_version__layer__local_path"), 1258 'ordericon':_get_toggle_order_icon(request, "layer_version__local_path"),
1259 'orderkey' : 'layer_version__layer__local_path', 1259 'orderkey' : 'layer_version__local_path',
1260 'clclass': 'layer_version__layer__local_path', 'hidden': 1, 1260 'clclass': 'layer_version__local_path', 'hidden': 1,
1261 }) 1261 })
1262 1262
1263 1263
@@ -1464,10 +1464,10 @@ def bpackage(request, build_id):
1464 tc_layerDir = { 1464 tc_layerDir = {
1465 'name':'Layer directory', 1465 'name':'Layer directory',
1466 'qhelp':'Path to the layer providing the recipe that builds the package', 1466 'qhelp':'Path to the layer providing the recipe that builds the package',
1467 'orderfield': _get_toggle_order(request, "recipe__layer_version__layer__local_path"), 1467 'orderfield': _get_toggle_order(request, "recipe__layer_version__local_path"),
1468 'ordericon':_get_toggle_order_icon(request, "recipe__layer_version__layer__local_path"), 1468 'ordericon':_get_toggle_order_icon(request, "recipe__layer_version__local_path"),
1469 'orderkey' : 'recipe__layer_version__layer__local_path', 1469 'orderkey' : 'recipe__layer_version__local_path',
1470 'clclass': 'recipe__layer_version__layer__local_path', 'hidden': 1, 1470 'clclass': 'recipe__layer_version__local_path', 'hidden': 1,
1471 } 1471 }
1472 context['tablecols'].append(tc_layerDir) 1472 context['tablecols'].append(tc_layerDir)
1473 1473