From: Cristiana Voicu Date: Tue, 20 Aug 2013 13:30:22 +0000 (+0300) Subject: bitbake: hob: changes to image combo box from image configuration page X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=136cb5e6b8a2ade47e32dcbc1f76a6955359b063;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index dcf1334aace..ca168bc49fc 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -319,6 +319,8 @@ class ImageConfigurationPage (HobPage): # reset machine_combo_changed_by_manual self.machine_combo_changed_by_manual = True + self.builder.configuration.selected_image = None + # Do reparse recipes self.builder.populate_recipe_package_info_async() @@ -457,7 +459,7 @@ class ImageConfigurationPage (HobPage): self.image_combo.append_text(self.__custom_image__) self.image_combo.append_text("--Separator--") - cnt = cnt + 3 + cnt = cnt + 2 topdir = self.builder.get_topdir() # append and set active