summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-08-20 13:30:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 11:51:59 (GMT)
commit136cb5e6b8a2ade47e32dcbc1f76a6955359b063 (patch)
treed2939b757aa7ea2ce521c40925a3bc122711fc35
parent8d1e77ec31972de5841eb7b0e8f5f7912774175f (diff)
downloadpoky-136cb5e6b8a2ade47e32dcbc1f76a6955359b063.tar.gz
bitbake: hob: changes to image combo box from image configuration page
In some cases when a new machine is selected, the image combo shows the same option. Fixed this issue, because the image combo box should be reseted. Fix the counter for the options in the combobox. This bug was introduced by the templates functionality. The combo box had some last changes, and I forgot about this counter. [YOCTO #4858 & #5000] (Bitbake rev: 457fd80ee6b1b2bcef463e3a83e048da2f8bf805) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index dcf1334..ca168bc 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -319,6 +319,8 @@ class ImageConfigurationPage (HobPage):
319 # reset machine_combo_changed_by_manual 319 # reset machine_combo_changed_by_manual
320 self.machine_combo_changed_by_manual = True 320 self.machine_combo_changed_by_manual = True
321 321
322 self.builder.configuration.selected_image = None
323
322 # Do reparse recipes 324 # Do reparse recipes
323 self.builder.populate_recipe_package_info_async() 325 self.builder.populate_recipe_package_info_async()
324 326
@@ -457,7 +459,7 @@ class ImageConfigurationPage (HobPage):
457 459
458 self.image_combo.append_text(self.__custom_image__) 460 self.image_combo.append_text(self.__custom_image__)
459 self.image_combo.append_text("--Separator--") 461 self.image_combo.append_text("--Separator--")
460 cnt = cnt + 3 462 cnt = cnt + 2
461 463
462 topdir = self.builder.get_topdir() 464 topdir = self.builder.get_topdir()
463 # append and set active 465 # append and set active