diff options
| author |   Cristiana Voicu <cristiana.voicu@intel.com> | 2012-12-12 13:51:51 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-14 13:06:16 +0000 |
| commit | 22007cf71a00fbb03b40f97201a6eb06c9aebd16 (patch) | |
| tree | 9a036ec72e124142013da97653c90d53dd966b35 /lib/bb/ui/crumbs/builder.py | |
| parent | 4a36a1af71530afc8fa896271fa94362ead176bd (diff) | |
| download | bitbake-22007cf71a00fbb03b40f97201a6eb06c9aebd16.tar.gz | |
hob/bitbake: custom image is now using the base image
Till now, a custom image made in Hob was using only the packages from
the base image. Now it is using everything declared in the base image.
Also next to hob-image.bb, it creates another .bb file which is used
in building process. Those images are ignored by git.
[YOCTO #2601]
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/ui/crumbs/builder.py')
| -rwxr-xr-x | lib/bb/ui/crumbs/builder.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index 2f3d6d0c6..023ac93ae 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -611,15 +611,18 @@ class Builder(gtk.Window): # Build image self.set_user_config() toolchain_packages = [] + base_image = None if self.configuration.toolchain_build: toolchain_packages = self.package_model.get_selected_packages_toolchain() if self.configuration.selected_image == self.recipe_model.__custom_image__: packages = self.package_model.get_selected_packages() image = self.hob_image + base_image = self.configuration.initial_selected_image else: packages = [] image = self.configuration.selected_image self.handler.generate_image(image, + base_image, self.hob_toolchain, packages, toolchain_packages, @@ -1017,7 +1020,8 @@ class Builder(gtk.Window): self.parameters.image_names = [] selected_image = self.recipe_model.get_selected_image() if selected_image == self.recipe_model.__custom_image__: - linkname = 'hob-image-' + self.configuration.curr_mach + version = self.recipe_model.get_custom_image_version() + linkname = 'hob-image' + version+ "-" + self.configuration.curr_mach else: linkname = selected_image + '-' + self.configuration.curr_mach image_extension = self.get_image_extension() |