summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/bin/toaster4
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/base.html4
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/basebuildpage.html8
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/bpackage.html4
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/build.html4
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/layer.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/package.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/templates/task.html2
-rw-r--r--bitbake/lib/toaster/bldviewer/urls.py4
-rw-r--r--bitbake/lib/toaster/toastermain/urls.py4
10 files changed, 19 insertions, 19 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index d4715fa67b..7e51014b7d 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -87,8 +87,8 @@ BBBASEDIR=`dirname ${BASH_SOURCE}`/..
87 87
88# Verify prerequisites 88# Verify prerequisites
89 89
90if ! echo "import django; print (1,4,5) == django.VERSION[0:3]" | python 2>/dev/null | grep True >/dev/null; then 90if ! echo "import django; print (1,5) == django.VERSION[0:2]" | python 2>/dev/null | grep True >/dev/null; then
91 echo -e "This program needs Django 1.4.5. Please install with\n\nsudo pip install django==1.4.5" 91 echo -e "This program needs Django 1.5. Please install with\n\nsudo pip install django==1.5"
92 return 2 92 return 2
93fi 93fi
94 94
diff --git a/bitbake/lib/toaster/bldviewer/templates/base.html b/bitbake/lib/toaster/bldviewer/templates/base.html
index 101880d3ea..d58cbeaed5 100644
--- a/bitbake/lib/toaster/bldviewer/templates/base.html
+++ b/bitbake/lib/toaster/bldviewer/templates/base.html
@@ -14,8 +14,8 @@
14<div style="width:100%; height: 100%; position:absolute"> 14<div style="width:100%; height: 100%; position:absolute">
15<div style="width: 100%; height: 3em" class="nav"> 15<div style="width: 100%; height: 3em" class="nav">
16 <ul class="nav nav-tabs"> 16 <ul class="nav nav-tabs">
17 <li><a href="{% url all-builds %}">All Builds</a></li> 17 <li><a href="{% url "all-builds" %}">All Builds</a></li>
18 <li><a href="{% url all-layers %}">All Layers</a></li> 18 <li><a href="{% url "all-layers" %}">All Layers</a></li>
19 </ul> 19 </ul>
20</div> 20</div>
21 21
diff --git a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html b/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html
index 873f271bab..d590f28bc5 100644
--- a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html
+++ b/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html
@@ -3,14 +3,14 @@
3{% block pagename %} 3{% block pagename %}
4<ul class="nav nav-tabs" style="display: inline-block"> 4<ul class="nav nav-tabs" style="display: inline-block">
5 <li><a>Build {{build.target_set.all|join:"&nbsp;"}} at {{build.started_on}} : </a></li> 5 <li><a>Build {{build.target_set.all|join:"&nbsp;"}} at {{build.started_on}} : </a></li>
6 <li><a href="{% url task build.id %}"> Tasks </a></li> 6 <li><a href="{% url "task" build.id %}"> Tasks </a></li>
7 <li><a href="{% url bpackage build.id %}"> Build Packages </a></li> 7 <li><a href="{% url "bpackage" build.id %}"> Build Packages </a></li>
8 {% for t in build.target_set.all %} 8 {% for t in build.target_set.all %}
9 {% if t.is_image %} 9 {% if t.is_image %}
10 <li><a href="{% url tpackage build.id t.pk %}"> Packages for {{t.target}} </a> </li> 10 <li><a href="{% url "tpackage" build.id t.pk %}"> Packages for {{t.target}} </a> </li>
11 {% endif %} 11 {% endif %}
12 {% endfor %} 12 {% endfor %}
13 <li><a href="{% url configuration build.id %}"> Configuration </a> </li> 13 <li><a href="{% url "configuration" build.id %}"> Configuration </a> </li>
14</ul> 14</ul>
15 <h1>Toaster - Build {% block pagetitle %} {% endblock %}</h1> 15 <h1>Toaster - Build {% block pagetitle %} {% endblock %}</h1>
16{% endblock %} 16{% endblock %}
diff --git a/bitbake/lib/toaster/bldviewer/templates/bpackage.html b/bitbake/lib/toaster/bldviewer/templates/bpackage.html
index ca092ca6a0..07d079298e 100644
--- a/bitbake/lib/toaster/bldviewer/templates/bpackage.html
+++ b/bitbake/lib/toaster/bldviewer/templates/bpackage.html
@@ -21,9 +21,9 @@
21 {% for package in packages %} 21 {% for package in packages %}
22 22
23 <tr class="data"> 23 <tr class="data">
24 <td><a name="#{{package.name}}" href="{% url bfile build.pk package.pk %}">{{package.name}} ({{package.filelist_bpackage.count}} files)</a></td> 24 <td><a name="#{{package.name}}" href="{% url "bfile" build.pk package.pk %}">{{package.name}} ({{package.filelist_bpackage.count}} files)</a></td>
25 <td>{{package.version}}-{{package.revision}}</td> 25 <td>{{package.version}}-{{package.revision}}</td>
26 <td>{%if package.recipe%}<a href="{% url "layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td> 26 <td><a href="{% url "layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a></td>
27 27
28 <td>{{package.summary}}</td> 28 <td>{{package.summary}}</td>
29 <td>{{package.section}}</td> 29 <td>{{package.section}}</td>
diff --git a/bitbake/lib/toaster/bldviewer/templates/build.html b/bitbake/lib/toaster/bldviewer/templates/build.html
index 5f623504d5..5653cca357 100644
--- a/bitbake/lib/toaster/bldviewer/templates/build.html
+++ b/bitbake/lib/toaster/bldviewer/templates/build.html
@@ -23,10 +23,10 @@
23 </tr> 23 </tr>
24 {% for build in builds %} 24 {% for build in builds %}
25 <tr class="data"> 25 <tr class="data">
26 <td><a href="{% url configuration build.id %}">{{build.get_outcome_display}}</a></td> 26 <td><a href="{% url "configuration" build.id %}">{{build.get_outcome_display}}</a></td>
27 <td>{{build.started_on}}</td> 27 <td>{{build.started_on}}</td>
28 <td>{{build.completed_on}}</td> 28 <td>{{build.completed_on}}</td>
29 <td>{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url tpackage build.id t.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td> 29 <td>{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url "tpackage" build.id t.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td>
30 <td>{{build.machine}}</td> 30 <td>{{build.machine}}</td>
31 <td>{% time_difference build.started_on build.completed_on %}</td> 31 <td>{% time_difference build.started_on build.completed_on %}</td>
32 <td>{{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}<p>{{error.message}}</p>{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %}</td> 32 <td>{{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}<p>{{error.message}}</p>{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %}</td>
diff --git a/bitbake/lib/toaster/bldviewer/templates/layer.html b/bitbake/lib/toaster/bldviewer/templates/layer.html
index fa4fd9bde8..c5034dea83 100644
--- a/bitbake/lib/toaster/bldviewer/templates/layer.html
+++ b/bitbake/lib/toaster/bldviewer/templates/layer.html
@@ -23,7 +23,7 @@
23 <td><table> 23 <td><table>
24 {% for lv in layer.versions %} 24 {% for lv in layer.versions %}
25 <tr><td> 25 <tr><td>
26 <a href="{% url layer_versions_recipes lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a> 26 <a href="{% url "layer_versions_recipes" lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a>
27 </td></tr> 27 </td></tr>
28 {% endfor %} 28 {% endfor %}
29 </table></td> 29 </table></td>
diff --git a/bitbake/lib/toaster/bldviewer/templates/package.html b/bitbake/lib/toaster/bldviewer/templates/package.html
index b1246e788a..fda9dab0f0 100644
--- a/bitbake/lib/toaster/bldviewer/templates/package.html
+++ b/bitbake/lib/toaster/bldviewer/templates/package.html
@@ -20,7 +20,7 @@
20 <td>{{package.version}}</td> 20 <td>{{package.version}}</td>
21 <td>{{package.size}}</td> 21 <td>{{package.size}}</td>
22 <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}"> 22 <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}">
23 <a href="{% url layer_versions_recipes package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td> 23 <a href="{% url "layer_versions_recipes" package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
24 <td> 24 <td>
25 <div style="height: 4em; overflow:auto"> 25 <div style="height: 4em; overflow:auto">
26 {% for d in package.package_dependencies_source.all %} 26 {% for d in package.package_dependencies_source.all %}
diff --git a/bitbake/lib/toaster/bldviewer/templates/task.html b/bitbake/lib/toaster/bldviewer/templates/task.html
index e7253698cd..5d9887e848 100644
--- a/bitbake/lib/toaster/bldviewer/templates/task.html
+++ b/bitbake/lib/toaster/bldviewer/templates/task.html
@@ -28,7 +28,7 @@
28 <tr class="data"> 28 <tr class="data">
29 <td>{{task.order}}</td> 29 <td>{{task.order}}</td>
30 <td><a name="{{task.recipe.name}}.{{task.task_name}}"> 30 <td><a name="{{task.recipe.name}}.{{task.task_name}}">
31 <a href="{% url layer_versions_recipes task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td> 31 <a href="{% url "layer_versions_recipes" task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td>
32 <td>{{task.recipe.version}}</td> 32 <td>{{task.recipe.version}}</td>
33 33
34 {% if task.task_executed %} 34 {% if task.task_executed %}
diff --git a/bitbake/lib/toaster/bldviewer/urls.py b/bitbake/lib/toaster/bldviewer/urls.py
index becc679203..b84c95f08b 100644
--- a/bitbake/lib/toaster/bldviewer/urls.py
+++ b/bitbake/lib/toaster/bldviewer/urls.py
@@ -17,7 +17,7 @@
17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18 18
19from django.conf.urls import patterns, include, url 19from django.conf.urls import patterns, include, url
20from django.views.generic.simple import redirect_to 20from django.views.generic import RedirectView
21 21
22urlpatterns = patterns('bldviewer.views', 22urlpatterns = patterns('bldviewer.views',
23 url(r'^builds/$', 'build', name='all-builds'), 23 url(r'^builds/$', 'build', name='all-builds'),
@@ -28,5 +28,5 @@ urlpatterns = patterns('bldviewer.views',
28 url(r'^build/(?P<build_id>\d+)/configuration/$', 'configuration', name='configuration'), 28 url(r'^build/(?P<build_id>\d+)/configuration/$', 'configuration', name='configuration'),
29 url(r'^layers/$', 'layer', name='all-layers'), 29 url(r'^layers/$', 'layer', name='all-layers'),
30 url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'), 30 url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'),
31 url(r'^$', redirect_to, {'url': 'builds/'}), 31 url(r'^$', RedirectView.as_view( url= 'builds/')),
32) 32)
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py
index d0606bce9e..a696a0b216 100644
--- a/bitbake/lib/toaster/toastermain/urls.py
+++ b/bitbake/lib/toaster/toastermain/urls.py
@@ -17,7 +17,7 @@
17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 17# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18 18
19from django.conf.urls import patterns, include, url 19from django.conf.urls import patterns, include, url
20from django.views.generic.simple import redirect_to 20from django.views.generic import RedirectView
21from django.views.decorators.cache import never_cache 21from django.views.decorators.cache import never_cache
22 22
23 23
@@ -29,7 +29,7 @@ urlpatterns = patterns('',
29 url(r'^simple/', include('bldviewer.urls')), 29 url(r'^simple/', include('bldviewer.urls')),
30 url(r'^api/1.0/', include('bldviewer.api')), 30 url(r'^api/1.0/', include('bldviewer.api')),
31 url(r'^gui/', include('toastergui.urls')), 31 url(r'^gui/', include('toastergui.urls')),
32 url(r'^$', never_cache(redirect_to), {'url': '/simple/'}), 32 url(r'^$', never_cache(RedirectView.as_view(url='/simple/'))),
33 # Examples: 33 # Examples:
34 # url(r'^toaster/', include('toaster.foo.urls')), 34 # url(r'^toaster/', include('toaster.foo.urls')),
35 35