summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/orm/models.py13
-rw-r--r--bitbake/lib/toaster/toastergui/templates/mrb_section.html28
2 files changed, 37 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 4641736add..cfa243c595 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -628,6 +628,17 @@ class Build(models.Model):
return self.outcome == Build.IN_PROGRESS and \
self.recipes_parsed < self.recipes_to_parse
+ def is_starting(self):
+ """
+ True if the build has no completed tasks yet and is still just starting
+ tasks.
+
+ Note that the mechanism for testing whether a Task is "done" is whether
+ its order field is set, as per the completeper() method.
+ """
+ return self.outcome == Build.IN_PROGRESS and \
+ self.task_build.filter(order__isnull=False).count() == 0
+
def get_state(self):
"""
Get the state of the build; one of 'Succeeded', 'Failed', 'In Progress',
@@ -643,6 +654,8 @@ class Build(models.Model):
return 'Queued'
elif self.is_parsing():
return 'Parsing'
+ elif self.is_starting():
+ return 'Starting'
else:
return self.get_outcome_text()
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
index 880485d45f..b74f723932 100644
--- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html
+++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
@@ -71,6 +71,8 @@
<%include tmpl='#succeeded-or-failed-build-template'/%>
<%else state == 'Cancelling'%>
<%include tmpl='#cancelling-build-template'/%>
+ <%else state == 'Starting'%>
+ <%include tmpl='#starting-template'/%>
<%else state == 'In Progress'%>
<%include tmpl='#in-progress-build-template'/%>
<%else state == 'Cancelled'%>
@@ -81,8 +83,9 @@
<!-- queued build -->
<script id="queued-build-template" type="text/x-jsrender">
<div class="col-md-5">
- <span class="glyphicon glyphicon-question-sign get-help get-help-blue" title="This build is waiting for
-the build directory to become available"></span>
+ <span class="glyphicon glyphicon-question-sign get-help get-help-blue"
+ title="This build is waiting for the build directory to become available">
+ </span>
Build queued
</div>
@@ -108,7 +111,8 @@ the build directory to become available"></span>
<div class="col-md-4 progress-info">
<!-- parse completion percentage -->
- <span class="glyphicon glyphicon-question-sign get-help get-help-blue" title="BitBake is parsing the layers required for your build"></span>
+ <span class="glyphicon glyphicon-question-sign get-help get-help-blue" title="BitBake is parsing the layers required for your build">
+ </span>
Parsing <span id="recipes-parsed-percentage-<%:id%>"><%:recipes_parsed_percentage%></span>% complete
@@ -116,7 +120,23 @@ the build directory to become available"></span>
</div>
</script>
-<!-- in progress build -->
+<!-- in progress build; tasks still starting -->
+<script id="starting-template" type="text/x-jsrender">
+ <div class="col-md-5">
+ <span class="glyphicon glyphicon-question-sign get-help get-help-blue"
+ title="This build is waiting for tasks to start">
+ </span>
+
+ Tasks starting...
+ </div>
+
+ <div class="col-md-4">
+ <!-- cancel button -->
+ <%include tmpl='#cancel-template'/%>
+ </div>
+</script>
+
+<!-- in progress build; at least one task finished -->
<script id="in-progress-build-template" type="text/x-jsrender">
<!-- progress bar and task completion percentage -->
<div data-role="build-status" class="col-md-4 col-md-offset-1 progress-info">