From f9d9cc87c59e309516c3e8db423715139f6a8f62 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Wed, 12 Dec 2012 13:51:51 +0200 Subject: bitbake: 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] (Bitbake rev: 22007cf71a00fbb03b40f97201a6eb06c9aebd16) Signed-off-by: Cristiana Voicu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/ui/crumbs/builder.py') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 2f3d6d0c6c..023ac93ae2 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/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() -- cgit v1.2.3-54-g00ecf