[bitbake-devel] [PATCH 1/1] Hob: Fix contents in imagedetailsscreen
Dongxiao Xu
dongxiao.xu at intel.com
Mon Apr 16 07:51:43 UTC 2012
This commit fixes the contents in imagedetailsscreen, which lacks some
kind of image types, e.x., iso and hddimg.
Signed-off-by: Dongxiao Xu <dongxiao.xu at intel.com>
---
lib/bb/ui/crumbs/builder.py | 9 +++++----
lib/bb/ui/crumbs/hig.py | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py
index bd45016..6b172d0 100755
--- a/lib/bb/ui/crumbs/builder.py
+++ b/lib/bb/ui/crumbs/builder.py
@@ -32,7 +32,7 @@ from bb.ui.crumbs.recipeselectionpage import RecipeSelectionPage
from bb.ui.crumbs.packageselectionpage import PackageSelectionPage
from bb.ui.crumbs.builddetailspage import BuildDetailsPage
from bb.ui.crumbs.imagedetailspage import ImageDetailsPage
-from bb.ui.crumbs.hobwidget import hwc, HobButton, HobAltButton
+from bb.ui.crumbs.hobwidget import hwc, HobButton, HobAltButton, hcc
from bb.ui.crumbs.hig import CrumbsMessageDialog, ImageSelectionDialog, \
AdvancedSettingDialog, LayerSelectionDialog, \
DeployImageDialog
@@ -752,9 +752,10 @@ class Builder(gtk.Window):
else:
linkname = selected_image + '-' + self.configuration.curr_mach
for image_type in self.parameters.image_types:
- linkpath = self.parameters.image_addr + '/' + linkname + '.' + image_type
- if os.path.exists(linkpath):
- self.parameters.image_names.append(os.readlink(linkpath))
+ for real_image_type in hcc.SUPPORTED_IMAGE_TYPES[image_type]:
+ linkpath = self.parameters.image_addr + '/' + linkname + '.' + real_image_type
+ if os.path.exists(linkpath):
+ self.parameters.image_names.append(os.readlink(linkpath))
elif self.current_step == self.PACKAGE_GENERATING:
fraction = 1.0
self.build_details_page.update_progress_bar("Build Completed: ", fraction)
diff --git a/lib/bb/ui/crumbs/hig.py b/lib/bb/ui/crumbs/hig.py
index 322efc6..a85b478 100644
--- a/lib/bb/ui/crumbs/hig.py
+++ b/lib/bb/ui/crumbs/hig.py
@@ -1107,7 +1107,7 @@ class ImageSelectionDialog (CrumbsDialog):
for image_type in self.image_types:
for real_image_type in hcc.SUPPORTED_IMAGE_TYPES[image_type]:
if f.endswith('.' + real_image_type):
- imageset.add(f.rsplit('.' + real_image_type)[0])
+ imageset.add(f.rsplit('.' + real_image_type)[0].rsplit('.rootfs')[0])
self.image_list.append(f)
for image in imageset:
--
1.7.4.1
More information about the bitbake-devel
mailing list