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/toastergui/views.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'bitbake/lib/toaster/toastergui/views.py') 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