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:08:49 +0000 |
commit | f9d9cc87c59e309516c3e8db423715139f6a8f62 (patch) | |
tree | eeed21d7dbd0fce3da1e4d9d30d38155a576b473 /bitbake/lib/bb/ui/crumbs/builder.py | |
parent | a947b547d0a5f247e39cbc0fae88c0de5438aa7b (diff) | |
download | poky-f9d9cc87c59e309516c3e8db423715139f6a8f62.tar.gz |
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 <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 6 |
1 files changed, 5 insertions, 1 deletions
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): | |||
611 | # Build image | 611 | # Build image |
612 | self.set_user_config() | 612 | self.set_user_config() |
613 | toolchain_packages = [] | 613 | toolchain_packages = [] |
614 | base_image = None | ||
614 | if self.configuration.toolchain_build: | 615 | if self.configuration.toolchain_build: |
615 | toolchain_packages = self.package_model.get_selected_packages_toolchain() | 616 | toolchain_packages = self.package_model.get_selected_packages_toolchain() |
616 | if self.configuration.selected_image == self.recipe_model.__custom_image__: | 617 | if self.configuration.selected_image == self.recipe_model.__custom_image__: |
617 | packages = self.package_model.get_selected_packages() | 618 | packages = self.package_model.get_selected_packages() |
618 | image = self.hob_image | 619 | image = self.hob_image |
620 | base_image = self.configuration.initial_selected_image | ||
619 | else: | 621 | else: |
620 | packages = [] | 622 | packages = [] |
621 | image = self.configuration.selected_image | 623 | image = self.configuration.selected_image |
622 | self.handler.generate_image(image, | 624 | self.handler.generate_image(image, |
625 | base_image, | ||
623 | self.hob_toolchain, | 626 | self.hob_toolchain, |
624 | packages, | 627 | packages, |
625 | toolchain_packages, | 628 | toolchain_packages, |
@@ -1017,7 +1020,8 @@ class Builder(gtk.Window): | |||
1017 | self.parameters.image_names = [] | 1020 | self.parameters.image_names = [] |
1018 | selected_image = self.recipe_model.get_selected_image() | 1021 | selected_image = self.recipe_model.get_selected_image() |
1019 | if selected_image == self.recipe_model.__custom_image__: | 1022 | if selected_image == self.recipe_model.__custom_image__: |
1020 | linkname = 'hob-image-' + self.configuration.curr_mach | 1023 | version = self.recipe_model.get_custom_image_version() |
1024 | linkname = 'hob-image' + version+ "-" + self.configuration.curr_mach | ||
1021 | else: | 1025 | else: |
1022 | linkname = selected_image + '-' + self.configuration.curr_mach | 1026 | linkname = selected_image + '-' + self.configuration.curr_mach |
1023 | image_extension = self.get_image_extension() | 1027 | image_extension = self.get_image_extension() |