Modified: models.py, update.py, recipes.html, detail.html,
recipedetail.html, additional.css
To identify image recipes and provide inheritance data for recipes, an
inherits field was added to the recipe model, and then populated using
refactored data from __inherit_cache. Finally the field was also added
to Toaster templates, along with style changes proposed in attachment.
Inherits field skips recipes from globally inherited data as proposed.
[YOCTO #7575]
Signed-off-by: Alex Franco <alejandro.fra...@linux.intel.com>
---
layerindex/models.py | 2 +-
layerindex/static/css/additional.css | 11 ++++++++++-
layerindex/update.py | 4 ++++
templates/layerindex/detail.html | 4 +++-
templates/layerindex/recipedetail.html | 4 ++++
templates/layerindex/recipes.html | 4 +++-
6 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/layerindex/models.py b/layerindex/models.py
index dd291a3..c9e9620 100644
--- a/layerindex/models.py
+++ b/layerindex/models.py
@@ -242,7 +242,7 @@ class Recipe(models.Model):
bugtracker = models.URLField(blank=True)
provides = models.CharField(max_length=255, blank=True)
bbclassextend = models.CharField(max_length=100, blank=True)
-
+ inherits = models.CharField(max_length=255, blank=True)
updated = models.DateTimeField(auto_now = True)
def vcs_web_url(self):
diff --git a/layerindex/static/css/additional.css
b/layerindex/static/css/additional.css
index 0703257..0d74db3 100644
--- a/layerindex/static/css/additional.css
+++ b/layerindex/static/css/additional.css
@@ -198,4 +198,13 @@ padding: 8px;
.buttonblock-btn {
margin-left: 8px;
-}
\ No newline at end of file
+}
+
+.icon-hdd {
+ margin-left: 2px;
+}
+
+.icon-hdd:hover {
+ cursor: pointer;
+}
+
diff --git a/layerindex/update.py b/layerindex/update.py
index a56507b..4419745 100755
--- a/layerindex/update.py
+++ b/layerindex/update.py
@@ -65,6 +65,10 @@ def update_recipe_file(data, path, recipe, layerdir_start,
repodir):
recipe.bugtracker = envdata.getVar("BUGTRACKER", True) or ""
recipe.provides = envdata.getVar("PROVIDES", True) or ""
recipe.bbclassextend = envdata.getVar("BBCLASSEXTEND", True) or ""
+ # Handle recipe inherits for this recipe
+ gr = set(data.getVar("__inherit_cache", True) or [])
+ lr = set(envdata.getVar("__inherit_cache", True) or [])
+ recipe.inherits = ' '.join(sorted({split_recipe_fn(r)[0] for r in lr
if r not in gr}))
recipe.save()
# Get file dependencies within this layer
diff --git a/templates/layerindex/detail.html b/templates/layerindex/detail.html
index e013e4c..c9439b3 100644
--- a/templates/layerindex/detail.html
+++ b/templates/layerindex/detail.html
@@ -198,7 +198,7 @@
<tbody>
{% for recipe in layerbranch.sorted_recipes %}
<tr>
- <td><a href="{% url recipe recipe.id
%}">{{ recipe.name }}</a></td>
+ <td><a href="{% url recipe recipe.id
%}">{{ recipe.name }}</a>{% if 'image' in recipe.inherits %}<i
class="icon-hdd"></i>{% endif %}</td>
<td>{{ recipe.pv }}</td>
<td class="span8">{{ recipe.short_desc
}}</td>
</tr>
@@ -321,6 +321,8 @@
e.preventDefault();
$(this).tab('show');
})
+
+ $('.icon-hdd').tooltip({title:"Inherits image"});
});
});
</script>
diff --git a/templates/layerindex/recipedetail.html
b/templates/layerindex/recipedetail.html
index 658694e..cde8e50 100644
--- a/templates/layerindex/recipedetail.html
+++ b/templates/layerindex/recipedetail.html
@@ -83,6 +83,10 @@
<th>Layer</th>
<td><a href="{% url layer_item
recipe.layerbranch.branch.name recipe.layerbranch.layer.name %}">{{
recipe.layerbranch.layer.name }}</a> ({{ recipe.layerbranch.branch.name}}
branch)</td>
</tr>
+ <tr>
+ <th>Inherits</th>
+ <td>{{ recipe.inherits }}</td>
+ </tr>
</tbody>
</table>
diff --git a/templates/layerindex/recipes.html
b/templates/layerindex/recipes.html
index 6777ed2..f1a7834 100644
--- a/templates/layerindex/recipes.html
+++ b/templates/layerindex/recipes.html
@@ -52,7 +52,7 @@
<tbody>
{% for recipe in recipe_list %}
<tr {% if recipe.preferred_count > 0
%}class="muted"{% endif %}>
- <td><a href="{% url recipe recipe.id %}">{{
recipe.name }}</a></td>
+ <td><a href="{% url recipe recipe.id %}">{{
recipe.name }}</a>{% if 'image' in recipe.inherits %}<i class="icon-hdd"></i>{%
endif %}</td>
<td>{{ recipe.pv }}</td>
<td>{{ recipe.short_desc }}</td>
<td><a href="{% url layer_item url_branch
recipe.layerbranch.layer.name %}">{{ recipe.layerbranch.layer.name }}</a></td>
@@ -82,6 +82,8 @@
firstfield = $("#filter-form input:text").first()
if( ! firstfield.val() )
firstfield.focus()
+
+ $('.icon-hdd').tooltip({title:"Inherits image"});
});
</script>
{% endblock %}
--
2.4.1
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
