From 47621ecb24eedd803f17a551230a524193089c9a Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Wed, 18 Dec 2013 19:50:45 +0000 Subject: bitbake: toaster: clone Simple UI as base for Toaster GUI This patch clones the Simple UI to provide the base code for the development of the Toaster GUI. The clone takes the place of the application that was reserved for Javascript MVC code. The templates used for Simple UI are renamed to start with an "simple_" to prevent name resolution conflict with the Toaster GUI templates. Minor changes are made to the settings.py and urls.py in the toaster main section to account for the newly enabled application. (Bitbake rev: e2fde84f16da017ba0d71aef6a1fa8e2b9255db4) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldviewer/templates/base.html | 30 ---------- .../toaster/bldviewer/templates/basebuildpage.html | 17 ------ .../lib/toaster/bldviewer/templates/basetable.html | 64 --------------------- bitbake/lib/toaster/bldviewer/templates/bfile.html | 24 -------- .../lib/toaster/bldviewer/templates/bpackage.html | 44 -------------- bitbake/lib/toaster/bldviewer/templates/build.html | 43 -------------- .../toaster/bldviewer/templates/configuration.html | 22 ------- bitbake/lib/toaster/bldviewer/templates/layer.html | 34 ----------- .../lib/toaster/bldviewer/templates/package.html | 36 ------------ .../lib/toaster/bldviewer/templates/recipe.html | 52 ----------------- .../toaster/bldviewer/templates/simple_base.html | 30 ++++++++++ .../bldviewer/templates/simple_basebuildpage.html | 17 ++++++ .../bldviewer/templates/simple_basetable.html | 64 +++++++++++++++++++++ .../toaster/bldviewer/templates/simple_bfile.html | 24 ++++++++ .../bldviewer/templates/simple_bpackage.html | 44 ++++++++++++++ .../toaster/bldviewer/templates/simple_build.html | 43 ++++++++++++++ .../bldviewer/templates/simple_configuration.html | 22 +++++++ .../toaster/bldviewer/templates/simple_layer.html | 34 +++++++++++ .../bldviewer/templates/simple_package.html | 36 ++++++++++++ .../toaster/bldviewer/templates/simple_recipe.html | 52 +++++++++++++++++ .../toaster/bldviewer/templates/simple_task.html | 67 ++++++++++++++++++++++ bitbake/lib/toaster/bldviewer/templates/task.html | 67 ---------------------- 22 files changed, 433 insertions(+), 433 deletions(-) delete mode 100644 bitbake/lib/toaster/bldviewer/templates/base.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/basebuildpage.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/basetable.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/bfile.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/bpackage.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/build.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/configuration.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/layer.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/package.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/recipe.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_base.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_basetable.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_bfile.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_build.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_configuration.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_layer.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_package.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_recipe.html create mode 100644 bitbake/lib/toaster/bldviewer/templates/simple_task.html delete mode 100644 bitbake/lib/toaster/bldviewer/templates/task.html (limited to 'bitbake/lib/toaster/bldviewer/templates') diff --git a/bitbake/lib/toaster/bldviewer/templates/base.html b/bitbake/lib/toaster/bldviewer/templates/base.html deleted file mode 100644 index d58cbeaed5..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/base.html +++ /dev/null @@ -1,30 +0,0 @@ - -{% load static %} - - - Toaster Simple Explorer - - - - - - -
-
- -
- -
-{% block pagecontent %} -{% endblock %} -
-

About Toaster | Yocto Project
-
- - - diff --git a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html b/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html deleted file mode 100644 index d590f28bc5..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "basetable.html" %} - -{% block pagename %} - -

Toaster - Build {% block pagetitle %} {% endblock %}

-{% endblock %} - diff --git a/bitbake/lib/toaster/bldviewer/templates/basetable.html b/bitbake/lib/toaster/bldviewer/templates/basetable.html deleted file mode 100644 index 16628eafbe..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/basetable.html +++ /dev/null @@ -1,64 +0,0 @@ -{% extends "base.html" %} - -{% block pagecontent %} - -
- - {% block pagename %} - {% endblock %} -
Filter: -
- {% if hideshowcols %} -
Show/Hide columns: - {% for i in hideshowcols %} - {{i.name}} | - {% endfor %} -
- {% endif %} -
- -
Showing {{objects.start_index}} to {{objects.end_index}} out of {{objects.paginator.count}} entries.  -
    -{%if objects.has_previous %} -
  • «
    • -{%else%} -
  • «
    • -{%endif%} -{% for i in objects.page_range %} - {{i}} -{% endfor %} -{%if objects.has_next%} -
  • »
    • -{%else%} -
  • »
    • -{%endif%} -
-
- - -{% block pagetable %} -{% endblock %} -
- - -{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/bfile.html b/bitbake/lib/toaster/bldviewer/templates/bfile.html deleted file mode 100644 index c7f59434a5..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/bfile.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "basebuildpage.html" %} - -{% block pagetitle %}Files for package {{objects.0.bpackage.name}} {% endblock %} -{% block pagetable %} - {% if not objects %} -

No files were recorded for this package!

- {% else %} - - - Name - Size (Bytes) - - - {% for file in objects %} - - - {{file.path}} - {{file.size}} - - {% endfor %} - - {% endif %} - -{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/bpackage.html b/bitbake/lib/toaster/bldviewer/templates/bpackage.html deleted file mode 100644 index 67fc65ca3e..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/bpackage.html +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "basebuildpage.html" %} - -{% block pagetitle %}Packages{% endblock %} -{% block pagetable %} - {% if not objects %} -

No packages were recorded for this target!

- {% else %} - - - Name - Version - Recipe - Summary - Section - Description - Size on host disk (Bytes) - License - Dependencies List (all) - - - {% for package in objects %} - - - {{package.name}} ({{package.filelist_bpackage.count}} files) - {{package.version}}-{{package.revision}} - {%if package.recipe%}{{package.recipe.name}}{{package.package_name}}{%endif%} - - {{package.summary}} - {{package.section}} - {{package.description}} - {{package.size}} - {{package.license}} - -
- {% for bpd in package.package_dependencies_source.all %} - {{bpd.dep_type}}: {{bpd.depends_on.name}}
- {% endfor %} -
- - {% endfor %} - - {% endif %} - -{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/build.html b/bitbake/lib/toaster/bldviewer/templates/build.html deleted file mode 100644 index 4fa87d5271..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/build.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends "basetable.html" %} - -{% block pagename %} -

Toaster - Builds

-{% endblock %} - -{% block pagetable %} - - {% load projecttags %} - - Outcome - Started On - Completed On - Target - Machine - Time - Errors - Warnings - Output - Log - Bitbake Version - Build Name - - {% for build in objects %} - - {{build.get_outcome_display}} - {{build.started_on}} - {{build.completed_on}} - {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} - {{build.machine}} - {% time_difference build.started_on build.completed_on %} - {{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}

{{error.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} - {{build.warnings_no}}:{% if build.warnings_no %}{% for warning in logs %}{% if warning.build == build %}{% if warning.level == 1 %}

{{warning.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} - {% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}{{build.image_fstypes}}{% endif %}{% endfor %}{% endif %} - {{build.cooker_log_path}} - {{build.bitbake_version}} - {{build.build_name}} - - - {% endfor %} -{% endblock %} - - diff --git a/bitbake/lib/toaster/bldviewer/templates/configuration.html b/bitbake/lib/toaster/bldviewer/templates/configuration.html deleted file mode 100644 index 521620fdce..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/configuration.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "basebuildpage.html" %} - -{% block pagetitle %}Configuration{% endblock %} -{% block pagetable %} - - - Name - Description - Definition history - Value - - - {% for variable in objects %} - - - {{variable.variable_name}} - {% if variable.description %}{{variable.description}}{% endif %} - {% for vh in variable.variablehistory_set.all %}{{vh.operation}} in {{vh.file_name}}:{{vh.line_number}}
{%endfor%} - {{variable.variable_value}} - {% endfor %} - -{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/layer.html b/bitbake/lib/toaster/bldviewer/templates/layer.html deleted file mode 100644 index 410d766c60..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/layer.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "basetable.html" %} - -{% block pagename %} -

Toaster - Layers

-{% endblock %} - -{% block pagetable %} - {% load projecttags %} - - - Name - Local Path - Layer Index URL - Known Versions - - - {% for layer in objects %} - - - {{layer.name}} - {{layer.local_path}} - {{layer.layer_index_url}} - - {% for lv in layer.versions %} - - {% endfor %} -
- ({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes) -
- - - {% endfor %} - -{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/package.html b/bitbake/lib/toaster/bldviewer/templates/package.html deleted file mode 100644 index 1ba372608d..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/package.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "basebuildpage.html" %} - -{% block pagetable %} - {% if not objects %} -

No packages were recorded for this target!

- {% else %} - - - Name - Version - Size (Bytes) - Recipe - Depends on - - - {% for package in objects %} - - - {{package.name}} - {{package.version}} - {{package.size}} - {%if package.recipe %} - {{package.recipe.name}}{{package.package_name}}{%endif%} - -
- {% for d in package.package_dependencies_source.all %} - {{d.depends_on.name}}
- {% endfor %} -
- - - {% endfor %} - - {% endif %} - -{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/recipe.html b/bitbake/lib/toaster/bldviewer/templates/recipe.html deleted file mode 100644 index d7f57eb9ea..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/recipe.html +++ /dev/null @@ -1,52 +0,0 @@ -{% extends "basetable.html" %} - -{% block pagename %} - -

Toaster - Recipes for a Layer

-{% endblock %} - -{% block pagetable %} - {% load projecttags %} - - - - 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 %} - -{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_base.html b/bitbake/lib/toaster/bldviewer/templates/simple_base.html new file mode 100644 index 0000000000..d58cbeaed5 --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_base.html @@ -0,0 +1,30 @@ + +{% load static %} + + + Toaster Simple Explorer + + + + + + +
+
+ +
+ +
+{% block pagecontent %} +{% endblock %} +
+

About Toaster | Yocto Project
+
+ + + diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html b/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html new file mode 100644 index 0000000000..8d64e2deb6 --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_basebuildpage.html @@ -0,0 +1,17 @@ +{% extends "simple_basetable.html" %} + +{% block pagename %} + +

Toaster - Build {% block pagetitle %} {% endblock %}

+{% endblock %} + diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_basetable.html b/bitbake/lib/toaster/bldviewer/templates/simple_basetable.html new file mode 100644 index 0000000000..762d78629c --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_basetable.html @@ -0,0 +1,64 @@ +{% extends "simple_base.html" %} + +{% block pagecontent %} + +
+ + {% block pagename %} + {% endblock %} +
Filter: +
+ {% if hideshowcols %} +
Show/Hide columns: + {% for i in hideshowcols %} + {{i.name}} | + {% endfor %} +
+ {% endif %} +
+ +
Showing {{objects.start_index}} to {{objects.end_index}} out of {{objects.paginator.count}} entries.  +
    +{%if objects.has_previous %} +
  • «
    • +{%else%} +
  • «
    • +{%endif%} +{% for i in objects.page_range %} + {{i}} +{% endfor %} +{%if objects.has_next%} +
  • »
    • +{%else%} +
  • »
    • +{%endif%} +
+
+ + +{% block pagetable %} +{% endblock %} +
+ + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_bfile.html b/bitbake/lib/toaster/bldviewer/templates/simple_bfile.html new file mode 100644 index 0000000000..cd1e553508 --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_bfile.html @@ -0,0 +1,24 @@ +{% extends "simple_basebuildpage.html" %} + +{% block pagetitle %}Files for package {{objects.0.bpackage.name}} {% endblock %} +{% block pagetable %} + {% if not objects %} +

No files were recorded for this package!

+ {% else %} + + + Name + Size (Bytes) + + + {% for file in objects %} + + + {{file.path}} + {{file.size}} + + {% endfor %} + + {% endif %} + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html b/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html new file mode 100644 index 0000000000..37ceb62315 --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_bpackage.html @@ -0,0 +1,44 @@ +{% extends "simple_basebuildpage.html" %} + +{% block pagetitle %}Packages{% endblock %} +{% block pagetable %} + {% if not objects %} +

No packages were recorded for this target!

+ {% else %} + + + Name + Version + Recipe + Summary + Section + Description + Size on host disk (Bytes) + License + Dependencies List (all) + + + {% for package in objects %} + + + {{package.name}} ({{package.filelist_bpackage.count}} files) + {{package.version}}-{{package.revision}} + {%if package.recipe%}{{package.recipe.name}}{{package.package_name}}{%endif%} + + {{package.summary}} + {{package.section}} + {{package.description}} + {{package.size}} + {{package.license}} + +
+ {% for bpd in package.package_dependencies_source.all %} + {{bpd.dep_type}}: {{bpd.depends_on.name}}
+ {% endfor %} +
+ + {% endfor %} + + {% endif %} + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_build.html b/bitbake/lib/toaster/bldviewer/templates/simple_build.html new file mode 100644 index 0000000000..985bcfdf8b --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_build.html @@ -0,0 +1,43 @@ +{% extends "simple_basetable.html" %} + +{% block pagename %} +

Toaster - Builds

+{% endblock %} + +{% block pagetable %} + + {% load projecttags %} + + Outcome + Started On + Completed On + Target + Machine + Time + Errors + Warnings + Output + Log + Bitbake Version + Build Name + + {% for build in objects %} + + {{build.get_outcome_display}} + {{build.started_on}} + {{build.completed_on}} + {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} + {{build.machine}} + {% time_difference build.started_on build.completed_on %} + {{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}

{{error.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} + {{build.warnings_no}}:{% if build.warnings_no %}{% for warning in logs %}{% if warning.build == build %}{% if warning.level == 1 %}

{{warning.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} + {% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}{{build.image_fstypes}}{% endif %}{% endfor %}{% endif %} + {{build.cooker_log_path}} + {{build.bitbake_version}} + {{build.build_name}} + + + {% endfor %} +{% endblock %} + + diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_configuration.html b/bitbake/lib/toaster/bldviewer/templates/simple_configuration.html new file mode 100644 index 0000000000..c5fe20d82e --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_configuration.html @@ -0,0 +1,22 @@ +{% extends "simple_basebuildpage.html" %} + +{% block pagetitle %}Configuration{% endblock %} +{% block pagetable %} + + + Name + Description + Definition history + Value + + + {% for variable in objects %} + + + {{variable.variable_name}} + {% if variable.description %}{{variable.description}}{% endif %} + {% for vh in variable.variablehistory_set.all %}{{vh.operation}} in {{vh.file_name}}:{{vh.line_number}}
{%endfor%} + {{variable.variable_value}} + {% endfor %} + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_layer.html b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html new file mode 100644 index 0000000000..35dd99e284 --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_layer.html @@ -0,0 +1,34 @@ +{% extends "simple_basetable.html" %} + +{% block pagename %} +

Toaster - Layers

+{% endblock %} + +{% block pagetable %} + {% load projecttags %} + + + Name + Local Path + Layer Index URL + Known Versions + + + {% for layer in objects %} + + + {{layer.name}} + {{layer.local_path}} + {{layer.layer_index_url}} + + {% for lv in layer.versions %} + + {% endfor %} +
+ ({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes) +
+ + + {% endfor %} + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_package.html b/bitbake/lib/toaster/bldviewer/templates/simple_package.html new file mode 100644 index 0000000000..29df0ca9a1 --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_package.html @@ -0,0 +1,36 @@ +{% extends "simple_basebuildpage.html" %} + +{% block pagetable %} + {% if not objects %} +

No packages were recorded for this target!

+ {% else %} + + + Name + Version + Size (Bytes) + Recipe + Depends on + + + {% for package in objects %} + + + {{package.name}} + {{package.version}} + {{package.size}} + {%if package.recipe %} + {{package.recipe.name}}{{package.package_name}}{%endif%} + +
+ {% for d in package.package_dependencies_source.all %} + {{d.depends_on.name}}
+ {% endfor %} +
+ + + {% endfor %} + + {% endif %} + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_recipe.html b/bitbake/lib/toaster/bldviewer/templates/simple_recipe.html new file mode 100644 index 0000000000..4c7030e48a --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_recipe.html @@ -0,0 +1,52 @@ +{% extends "simple_basetable.html" %} + +{% block pagename %} + +

Toaster - Recipes for a Layer

+{% endblock %} + +{% block pagetable %} + {% load projecttags %} + + + + 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 %} + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/simple_task.html b/bitbake/lib/toaster/bldviewer/templates/simple_task.html new file mode 100644 index 0000000000..3247ea94f5 --- /dev/null +++ b/bitbake/lib/toaster/bldviewer/templates/simple_task.html @@ -0,0 +1,67 @@ +{% extends "simple_basebuildpage.html" %} + +{% block pagetitle %}Tasks{% endblock %} +{% block pagetable %} + {% if not objects %} +

No tasks were executed in this build!

+ {% else %} + + + Order + Task + Recipe Version + Task Type + Checksum + Outcome + Message + Time + CPU usage + Disk I/O + Script type + Filesystem + Depends + + + {% for task in objects %} + + + {{task.order}} + + {{task.recipe.name}}.{{task.task_name}} + {{task.recipe.version}} + + {% if task.task_executed %} + Executed + {% else %} + Prebuilt + {% endif %} + + {{task.sstate_checksum}} + {{task.get_outcome_display}}{% if task.provider %}
(by {{task.provider.recipe.name}}.{{task.provider.task_name}}){% endif %} +

{{task.message}} + {{task.elapsed_time}} + {{task.cpu_usage}} + {{task.disk_io}} + {{task.get_script_type_display}} + + + + + +
Recipe{{task.recipe.file_path}}
Source{{task.file_name}}:{{task.line_number}}
Workdir{{task.work_directory}}
Log{{task.logfile}}
+ + +

+ {% for tt in task.task_dependencies_task.all %} + + {{tt.depends_on.recipe.name}}.{{tt.depends_on.task_name}}
+ {% endfor %} +
+ + + + {% endfor %} + + {% endif %} + +{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/task.html b/bitbake/lib/toaster/bldviewer/templates/task.html deleted file mode 100644 index de965ab797..0000000000 --- a/bitbake/lib/toaster/bldviewer/templates/task.html +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "basebuildpage.html" %} - -{% block pagetitle %}Tasks{% endblock %} -{% block pagetable %} - {% if not objects %} -

No tasks were executed in this build!

- {% else %} - - - Order - Task - Recipe Version - Task Type - Checksum - Outcome - Message - Time - CPU usage - Disk I/O - Script type - Filesystem - Depends - - - {% for task in objects %} - - - {{task.order}} - - {{task.recipe.name}}.{{task.task_name}} - {{task.recipe.version}} - - {% if task.task_executed %} - Executed - {% else %} - Prebuilt - {% endif %} - - {{task.sstate_checksum}} - {{task.get_outcome_display}}{% if task.provider %}
(by {{task.provider.recipe.name}}.{{task.provider.task_name}}){% endif %} -

{{task.message}} - {{task.elapsed_time}} - {{task.cpu_usage}} - {{task.disk_io}} - {{task.get_script_type_display}} - - - - - -
Recipe{{task.recipe.file_path}}
Source{{task.file_name}}:{{task.line_number}}
Workdir{{task.work_directory}}
Log{{task.logfile}}
- - -

- {% for tt in task.task_dependencies_task.all %} - - {{tt.depends_on.recipe.name}}.{{tt.depends_on.task_name}}
- {% endfor %} -
- - - - {% endfor %} - - {% endif %} - -{% endblock %} -- cgit v1.2.3-54-g00ecf