summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFarrell Wymore <farrell.wymore@windriver.com>2014-05-23 12:09:29 -0700
committerAlexandru DAMIAN <alexandru.damian@intel.com>2014-06-20 14:46:36 +0100
commitd004be9f6535567fb24f7bfa342932c03562f188 (patch)
tree020a9d72c91a7e00c1fa94774a7ee1f370185c3a
parentfa4b483c7077637427c7fac5da23ae5de27f554d (diff)
downloadbitbake-d004be9f6535567fb24f7bfa342932c03562f188.tar.gz
toaster: display message if no images are generated
Display message if no images are generated for a target. This commit was amended to have more conditions for displaying the message. [YOCTO #6094] Signed-off-by: Farrell Wymore <farrell.wymore@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/toaster/toastergui/templates/builddashboard.html15
-rwxr-xr-xlib/toaster/toastergui/views.py5
2 files changed, 20 insertions, 0 deletions
diff --git a/lib/toaster/toastergui/templates/builddashboard.html b/lib/toaster/toastergui/templates/builddashboard.html
index 9bd094ecc..f83ae083a 100644
--- a/lib/toaster/toastergui/templates/builddashboard.html
+++ b/lib/toaster/toastergui/templates/builddashboard.html
@@ -83,6 +83,19 @@
<dd><a href="{% url 'target' build.pk target.target.pk %}">{{target.npkg}}</a></dd>
<dt>Total package size</dt>
<dd>{{target.pkgsz|filtered_filesizeformat}}</dd>
+ {% if target.targetHasNoImages %}
+ <div class="alert alert-info">
+ <p>
+ <b>This build did not create any image files</b>
+ </p>
+ <p>
+ This is probably because valid image and license manifest
+ files from a previous build already exist in your
+ .../poky/build/tmp/deploy directory. You can also <b>view the
+ license manifest information</b> in Toaster.
+ </p>
+ </div>
+ {% else %}
<dt>
<i class="icon-question-sign get-help" title="The location in disk of the license manifest, a document listing all packages installed in your image and their licenses"></i>
<a href="{% url 'targetpkg' build.pk target.target.pk %}">License manifest</a>
@@ -100,10 +113,12 @@
{% endfor %}
</ul>
</dd>
+ {% endif %}
</dl>
</div>
{% endif %}
{% endfor %}
+
{% endif %}
</div>
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 6de448596..68e981a50 100755
--- a/lib/toaster/toastergui/views.py
+++ b/lib/toaster/toastergui/views.py
@@ -402,6 +402,7 @@ def builddashboard( request, build_id ):
targets = [ ]
ntargets = 0
hasImages = False
+ targetHasNoImages = False
for t in tgts:
elem = { }
elem[ 'target' ] = t
@@ -428,7 +429,11 @@ def builddashboard( request, build_id ):
ndx = 0;
f = i.file_name[ ndx + 1: ]
imageFiles.append({ 'path': f, 'size' : i.file_size })
+ if ( t.is_image and
+ (( len( imageFiles ) <= 0 ) or ( len( t.license_manifest_path ) <= 0 ))):
+ targetHasNoImages = True
elem[ 'imageFiles' ] = imageFiles
+ elem[ 'targetHasNoImages' ] = targetHasNoImages
targets.append( elem )
##