diff options
| author | Farrell Wymore <farrell.wymore@windriver.com> | 2014-05-23 12:09:29 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-20 14:03:58 +0100 |
| commit | fee3a886950b0adf18b249f9647eb6bb39650ea2 (patch) | |
| tree | a419dd6fd448e4f2c58b4ffd957b026401740f6f | |
| parent | 457091dc5650d92b2d6bc99cc37b4f1118606a0e (diff) | |
| download | poky-fee3a886950b0adf18b249f9647eb6bb39650ea2.tar.gz | |
bitbake: 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]
(Bitbake rev: ac1911eb857f4759ed085c8a4fc4b47cefafcd7a)
Signed-off-by: Farrell Wymore <farrell.wymore@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/builddashboard.html | 15 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 9bd094ecc4..f83ae083a9 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html | |||
| @@ -83,6 +83,19 @@ | |||
| 83 | <dd><a href="{% url 'target' build.pk target.target.pk %}">{{target.npkg}}</a></dd> | 83 | <dd><a href="{% url 'target' build.pk target.target.pk %}">{{target.npkg}}</a></dd> |
| 84 | <dt>Total package size</dt> | 84 | <dt>Total package size</dt> |
| 85 | <dd>{{target.pkgsz|filtered_filesizeformat}}</dd> | 85 | <dd>{{target.pkgsz|filtered_filesizeformat}}</dd> |
| 86 | {% if target.targetHasNoImages %} | ||
| 87 | <div class="alert alert-info"> | ||
| 88 | <p> | ||
| 89 | <b>This build did not create any image files</b> | ||
| 90 | </p> | ||
| 91 | <p> | ||
| 92 | This is probably because valid image and license manifest | ||
| 93 | files from a previous build already exist in your | ||
| 94 | .../poky/build/tmp/deploy directory. You can also <b>view the | ||
| 95 | license manifest information</b> in Toaster. | ||
| 96 | </p> | ||
| 97 | </div> | ||
| 98 | {% else %} | ||
| 86 | <dt> | 99 | <dt> |
| 87 | <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> | 100 | <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> |
| 88 | <a href="{% url 'targetpkg' build.pk target.target.pk %}">License manifest</a> | 101 | <a href="{% url 'targetpkg' build.pk target.target.pk %}">License manifest</a> |
| @@ -100,10 +113,12 @@ | |||
| 100 | {% endfor %} | 113 | {% endfor %} |
| 101 | </ul> | 114 | </ul> |
| 102 | </dd> | 115 | </dd> |
| 116 | {% endif %} | ||
| 103 | </dl> | 117 | </dl> |
| 104 | </div> | 118 | </div> |
| 105 | {% endif %} | 119 | {% endif %} |
| 106 | {% endfor %} | 120 | {% endfor %} |
| 121 | |||
| 107 | {% endif %} | 122 | {% endif %} |
| 108 | </div> | 123 | </div> |
| 109 | 124 | ||
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 6de448596a..68e981a50e 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
| @@ -402,6 +402,7 @@ def builddashboard( request, build_id ): | |||
| 402 | targets = [ ] | 402 | targets = [ ] |
| 403 | ntargets = 0 | 403 | ntargets = 0 |
| 404 | hasImages = False | 404 | hasImages = False |
| 405 | targetHasNoImages = False | ||
| 405 | for t in tgts: | 406 | for t in tgts: |
| 406 | elem = { } | 407 | elem = { } |
| 407 | elem[ 'target' ] = t | 408 | elem[ 'target' ] = t |
| @@ -428,7 +429,11 @@ def builddashboard( request, build_id ): | |||
| 428 | ndx = 0; | 429 | ndx = 0; |
| 429 | f = i.file_name[ ndx + 1: ] | 430 | f = i.file_name[ ndx + 1: ] |
| 430 | imageFiles.append({ 'path': f, 'size' : i.file_size }) | 431 | imageFiles.append({ 'path': f, 'size' : i.file_size }) |
| 432 | if ( t.is_image and | ||
| 433 | (( len( imageFiles ) <= 0 ) or ( len( t.license_manifest_path ) <= 0 ))): | ||
| 434 | targetHasNoImages = True | ||
| 431 | elem[ 'imageFiles' ] = imageFiles | 435 | elem[ 'imageFiles' ] = imageFiles |
| 436 | elem[ 'targetHasNoImages' ] = targetHasNoImages | ||
| 432 | targets.append( elem ) | 437 | targets.append( elem ) |
| 433 | 438 | ||
| 434 | ## | 439 | ## |
