sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Marius Avram 2014-04-03 15:15:59 +03:00 committed by Richard Purdie
parent f41241cecb
commit 07231022e2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitbake/lib/bb/ui/crumbs/builder.py
View File

@ -739,7 +739,8 @@ class Builder(gtk.Window):
def set_base_image(self):
self.configuration.initial_selected_image = self.configuration.selected_image
self.hob_image = self.configuration.selected_image + "-edited"
if self.configuration.selected_image != self.recipe_model.__custom_image__:
self.hob_image = self.configuration.selected_image + "-edited"
def reset(self):
self.configuration.curr_mach = ""

9
bitbake/lib/bb/ui/crumbs/hobeventhandler.py
View File

@ -171,10 +171,11 @@ class HobHandler(gobject.GObject):
self.generate_hob_base_image(target)
self.set_var_in_file("LINGUAS_INSTALL", "", "local.conf")
hobImage = self.runCommand(["matchFile", target + ".bb"])
baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])
version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True, ""])
target += version
self.recipe_model.set_custom_image_version(version)
if self.base_image != self.recipe_model.__custom_image__:
baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])
version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True, ""])
target += version
self.recipe_model.set_custom_image_version(version)
targets = [target]
if self.toolchain_packages: