summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/crumbs
diff options
context:
space:
mode:
authorMarius Avram <marius.avram@intel.com>2014-04-03 15:15:59 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 15:07:01 +0100
commit07231022e20e3e15f2c851617626b52e8de0843c (patch)
tree794cae392ab948e4869b6dee5ec8504f59c3f78c /bitbake/lib/bb/ui/crumbs
parentf41241cecb8d9611e2f8f98d00793e0c4ebf44ef (diff)
downloadpoky-07231022e20e3e15f2c851617626b52e8de0843c.tar.gz
bitbake: hob: fix customization of empty image recipe
This fixes a problem which happened when you tried to build an image by selecting 'Start with an empty image recipe' from the Image configuration page of hob. The reason on of the bug was that the name of the resulting image was threated the same way as ordinary custom images, when in fact they should use the default name: "hob-image", because they do not derive from any other recipe. [YOCTO #6102] (Bitbake rev: fa4ea3b4b40e7e9e6767e0cd51c6701e0af07135) Signed-off-by: Marius Avram <marius.avram@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py3
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py9
2 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 9adb1f7ba3..3033e77444 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -739,7 +739,8 @@ class Builder(gtk.Window):
739 739
740 def set_base_image(self): 740 def set_base_image(self):
741 self.configuration.initial_selected_image = self.configuration.selected_image 741 self.configuration.initial_selected_image = self.configuration.selected_image
742 self.hob_image = self.configuration.selected_image + "-edited" 742 if self.configuration.selected_image != self.recipe_model.__custom_image__:
743 self.hob_image = self.configuration.selected_image + "-edited"
743 744
744 def reset(self): 745 def reset(self):
745 self.configuration.curr_mach = "" 746 self.configuration.curr_mach = ""
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 890e05fa02..62c4704a7c 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -171,10 +171,11 @@ class HobHandler(gobject.GObject):
171 self.generate_hob_base_image(target) 171 self.generate_hob_base_image(target)
172 self.set_var_in_file("LINGUAS_INSTALL", "", "local.conf") 172 self.set_var_in_file("LINGUAS_INSTALL", "", "local.conf")
173 hobImage = self.runCommand(["matchFile", target + ".bb"]) 173 hobImage = self.runCommand(["matchFile", target + ".bb"])
174 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"]) 174 if self.base_image != self.recipe_model.__custom_image__:
175 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True, ""]) 175 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])
176 target += version 176 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True, ""])
177 self.recipe_model.set_custom_image_version(version) 177 target += version
178 self.recipe_model.set_custom_image_version(version)
178 179
179 targets = [target] 180 targets = [target]
180 if self.toolchain_packages: 181 if self.toolchain_packages: