From 587275eefd744032f00ebdce35134b2ab2bb7572 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Tue, 12 Jul 2016 15:54:50 -0700 Subject: bitbake: toaster: use has_images() methods to display images correctly In the build dashboard, we had issues with showing images correctly, as we were using the is_image property of targets to determine whether a target would have image files. This property can be set to True if a target refers to an image recipe (e.g. "core-image-minimal"), even if the task used in the build didn't produce any image files. By adding has_images() methods to the Target and Build objects, which count associated Target_Image_File objects, we can correctly determine whether a target has image files associated with it, and if any of the targets for a build has image files. This means that we can screen out the left-hand "Images" menu options for builds which contained image-related targets (e.g. "core-image-minimal") but which didn't produce any images (e.g. "rootfs" task). [YOCTO #9500] [YOCTO #9784] (Bitbake rev: f6bba0ff254d5ed3163151d4b938f3a43c9acb0a) Signed-off-by: Elliot Smith Signed-off-by: bavery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 28 ++++++++++++++++++++-- .../toastergui/templates/basebuildpage.html | 8 ++++--- bitbake/lib/toaster/toastergui/views.py | 9 ++----- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 61f6a2072e..0443a4589d 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -436,17 +436,32 @@ class Build(models.Model): eta += ((eta - self.started_on)*(100-completeper))/completeper return eta + def has_images(self): + """ + Returns True if at least one of the targets for this build has an + image file associated with it, False otherwise + """ + targets = Target.objects.filter(build_id=self.id) + has_images = False + for target in targets: + if target.has_images(): + has_images = True + break + return has_images + def get_image_file_extensions(self): """ - Get list of file name extensions for images produced by this build; + Get string of file name extensions for images produced by this build; note that this is the actual list of extensions stored on Target objects for this build, and not the value of IMAGE_FSTYPES. + + Returns comma-separated string, e.g. "vmdk, ext4" """ extensions = [] targets = Target.objects.filter(build_id = self.id) for target in targets: - if (not target.is_image): + if not target.is_image: continue target_image_files = Target_Image_File.objects.filter( @@ -739,6 +754,12 @@ class Target(models.Model): sdk_file.target = self sdk_file.save() + def has_images(self): + """ + Returns True if this target has one or more image files attached to it. + """ + return self.target_image_file_set.all().count() > 0 + # kernel artifacts for a target: bzImage and modules* class TargetKernelFile(models.Model): target = models.ForeignKey(Target) @@ -775,6 +796,9 @@ class Target_Image_File(models.Model): @property def suffix(self): + """ + Suffix for image file, minus leading "." + """ for suffix in Target_Image_File.SUFFIXES: if self.file_name.endswith(suffix): return suffix diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 856259a69d..e9927ebbaa 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html @@ -33,7 +33,7 @@ $("#build-menu li a").each(function(){ /* Set the page active state in the Build menu */ - var currentUrl = window.location.href.split('?')[0]; + var currentUrl = window.location.href.split('?')[0]; if (currentUrl === $(this).prop("href")){ $(this).parent().addClass("active"); } else { @@ -62,11 +62,13 @@ {% endif %} > Build summary - {% if build.target_set.all.0.is_image and build.outcome == 0 %} + {% if build.has_images and build.outcome == build.SUCCEEDED %}
  • Images
    • {% block nav-target %} {% for t in build.get_sorted_target_list %} -
  • + {% if t.has_images %} +
  • + {% endif %} {% endfor %} {% endblock %} {% endif %} diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index a82a261e0d..02caf54d50 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -471,19 +471,14 @@ def builddashboard( request, build_id ): recipeCount = Recipe.objects.filter( layer_version__id__in = layerVersionId ).count( ); tgts = Target.objects.filter( build_id = build_id ).order_by( 'target' ); - ## # set up custom target list with computed package and image data - # - targets = [ ] ntargets = 0 - hasImages = False + targetHasNoImages = False for t in tgts: elem = { } elem[ 'target' ] = t - if t.is_image: - hasImages = True npkg = 0 pkgsz = 0 package = None @@ -533,7 +528,7 @@ def builddashboard( request, build_id ): context = { 'build' : build, 'project' : build.project, - 'hasImages' : hasImages, + 'hasImages' : build.has_images(), 'ntargets' : ntargets, 'targets' : targets, 'recipecount' : recipeCount, -- cgit v1.2.3-54-g00ecf