diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html index 87c69b8d3c..5dea75382f 100644 --- a/bitbake/lib/toaster/toastergui/templates/recipe.html +++ b/bitbake/lib/toaster/toastergui/templates/recipe.html @@ -1,51 +1,275 @@ -{% extends "basebuildpage.html" %} +{% extends "basebuilddetailpage.html" %} + +{% load projecttags %} {% block localbreadcrumb %} -
  • Recipes
    • +
  • Recipes
    • +
  • {{object.name}}_{{object.version}}
    • {% endblock %} -{% block buildinfomain %} -{% include "basetable_top.html" %} +{% block pagedetailinfomain %} - - - Name - Version - Summary - Description - Section - License - License file - Homepage - Bugtracker - File_path - Recipe Dependency + +
    +
    +

    {{object.name}}_{{object.version}}

    +
    +
    - {% for recipe in objects %} +
    + +
    +
    +
    +
    + + Layer +
    +
    {{layer.name}}
    +
    + + Layer directory +
    +
    {{layer.local_path}}
    +
    + + Recipe file +
    +
    {{object.file_path}}
    +
    + + Layer branch +
    +
    {{layer_version.branch}}
    +
    + + Layer commit +
    +
    {{layer_version.commit}}
    +
    - - {{recipe.name}} - {{recipe.version}} - {{recipe.summary}} - {{recipe.description}} - {{recipe.section}} - {{recipe.license}} - {{recipe.licensing_info}} - {{recipe.homepage}} - {{recipe.bugtracker}} - {{recipe.file_path}} - -
    - {% for rr in recipe.r_dependencies_recipe.all %} - {{rr.depends_on.name}}
    - {% endfor %} +

    Tasks

    + {% if not tasks %} +
    + {{object.name}}_{{object.version}} does not have any tasks in this build. +
    + {% else %} + + + + + + + + + + + {% for task in tasks %} + + + + + + + {% if task.task_executed %} + + {% else %} + + {% endif %} + + + + + + + {% endfor %} + +
    + + Order + + + Task + + + Executed + + + Outcome + + + Cache attempt +
    {{task.order}} + {{task.task_name}} + + ExecutedPrebuilt{{task.get_outcome_display}} + {% ifnotequal task.sstate_result task.SSTATE_NA %} + {{task.get_sstate_result_display}} + + {% endifnotequal %} +
    + {% endif %}
    - - +
    + {% if not packages %} +
    + {{object.name}}_{{object.version}} does not build any packages. +
    + {% else %} + + + + + + + + + - {% endfor %} + {% for package in packages %} -{% include "basetable_bottom.html" %} + + + + + + + {% endfor %} + + +
    + Package + + Version + + Size +
    {{package.name}}{{package.version}}-{{package.revision}}{{package.size}}
    + {% endif %} +
    +
    + + {% if not object.r_dependencies_recipe.all %} +
    + {{object.name}}_{{object.version}} has no build dependencies. +
    + {% else %} + + + + + + + + + + {% for rr in object.r_dependencies_recipe.all %} + + + + + {% endfor %} + + +
    + Recipe + + Version +
    {{rr.depends_on.name}}{{rr.depends_on.version}}
    + {% endif %} + +
    +
    + + {% if not object.r_dependencies_depends.all %} +
    + {{object.name}}_{{object.version}} has no reverse build dependencies. +
    + {% else %} + + + + + + + + + + {% for rr in object.r_dependencies_depends.all %} + + + + + {% endfor %} + + +
    + Recipe + + Version +
    {{rr.recipe.name}}{{rr.recipe.version}}
    + {% endif %} + +
    +
    +
    + +
    +

    About {{object.name}}

    +
    + {% if object.summary %} +
    Summary
    +

    {{object.summary}}

    + {% endif %} + {% if object.description %} +
    Description
    +

    {{object.description}}

    + {% endif %} + {% if object.homepage %} +
    Homepage
    +
    {{object.homepage}}
    + {% endif %} + {% if object.bugtracker %} +
    Bugtracker
    +
    {{object.bugtracker}}
    + {% endif %} + {% if object.section %} +
    + Section + +
    +
    {{object.section}}
    + {% endif %} + {% if object.license %} +
    License
    +
    {{object.license}}
    + {% endif %} +
    +
    {% endblock %} diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html new file mode 100755 index 0000000000..2e0c2d1c6d --- /dev/null +++ b/bitbake/lib/toaster/toastergui/templates/recipes.html @@ -0,0 +1,52 @@ +{% extends "basebuildpage.html" %} + +{% block localbreadcrumb %} +
  • Recipes
    • +{% endblock %} + +{% block buildinfomain %} +
    +{% include "basetable_top.html" %} + + + + Name + Version + Summary + Description + Section + License + License file + Homepage + Bugtracker + File_path + Recipe Dependency + + + {% for recipe in objects %} + + + {{recipe.name}} + {{recipe.version}} + {{recipe.summary}} + {{recipe.description}} + {{recipe.section}} + {{recipe.license}} + {{recipe.licensing_info}} + {{recipe.homepage}} + {{recipe.bugtracker}} + {{recipe.file_path}} + +
    + {% for rr in recipe.r_dependencies_recipe.all %} + {{rr.depends_on.name}}
    + {% endfor %} +
    + + + + {% endfor %} + +{% include "basetable_bottom.html" %} +
    +{% endblock %} diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index d54c66be81..1604bb6bc4 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -335,9 +335,20 @@ def recipe(request, build_id, recipe_id): template = "recipe.html" if Recipe.objects.filter(pk=recipe_id).count() == 0 : return redirect(builds) + + object = Recipe.objects.filter(pk=recipe_id)[0] + layer_version = Layer_Version.objects.filter(pk=object.layer_version_id)[0] + layer = Layer.objects.filter(pk=layer_version.layer_id)[0] + tasks = Task.objects.filter(recipe_id = recipe_id).filter(build_id = build_id) + packages = Package.objects.filter(recipe_id = recipe_id).filter(build_id = build_id) + context = { - 'build' : Build.objects.filter(pk=build_id)[0], - 'object' : Recipe.objects.filter(pk=recipe_id)[0], + 'build' : Build.objects.filter(pk=build_id)[0], + 'object' : object, + 'layer_version' : layer_version, + 'layer' : layer, + 'tasks' : tasks, + 'packages': packages, } return render(request, template, context) @@ -399,7 +410,7 @@ def tasks(request, build_id): return render(request, template, context) def recipes(request, build_id): - template = 'recipe.html' + template = 'recipes.html' mandatory_parameters = { 'count': 100, 'page' : 1}; retval = _verify_parameters( request.GET, mandatory_parameters ) if retval: