diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-13 01:04:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 14:43:24 +0100 |
commit | fdb2027e6de6291486b36913d69ff49b769e2bb6 (patch) | |
tree | c86ab566d9a29096a37d0ab445167bdb3b56a745 /bitbake/lib/bb/ui/crumbs/builder.py | |
parent | 83cc0a118f4c7a5663097df9b117b8bebd77713a (diff) | |
download | poky-fdb2027e6de6291486b36913d69ff49b769e2bb6.tar.gz |
Hob: Build selected image if not customized
If user selected a base image and didn't customize it, Hob will still
build the selected image instead of hob-image.
This fixes [YOCTO #2253]
(Bitbake rev: a74a6a033e66a0ae7b47c84d842bdd54066c69a1)
Signed-off-by: Dongxiao Xu <dongxiao.xu@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 | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 5e90219b3c..3f26baceca 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -395,16 +395,21 @@ class Builder(gtk.Window): | |||
395 | 395 | ||
396 | def generate_image_async(self): | 396 | def generate_image_async(self): |
397 | self.switch_page(self.IMAGE_GENERATING) | 397 | self.switch_page(self.IMAGE_GENERATING) |
398 | self.handler.reset_build() | ||
398 | # Build image | 399 | # Build image |
399 | self.set_user_config() | 400 | self.set_user_config() |
400 | packages = self.package_model.get_selected_packages() | ||
401 | toolchain_packages = [] | 401 | toolchain_packages = [] |
402 | if self.configuration.toolchain_build: | 402 | if self.configuration.toolchain_build: |
403 | toolchain_packages = self.package_model.get_selected_packages_toolchain() | 403 | toolchain_packages = self.package_model.get_selected_packages_toolchain() |
404 | self.handler.reset_build() | 404 | if self.configuration.selected_image == self.recipe_model.__dummy_image__: |
405 | self.handler.generate_image(packages, | 405 | packages = self.package_model.get_selected_packages() |
406 | self.hob_image, | 406 | image = self.hob_image |
407 | else: | ||
408 | packages = [] | ||
409 | image = self.configuration.selected_image | ||
410 | self.handler.generate_image(image, | ||
407 | self.hob_toolchain, | 411 | self.hob_toolchain, |
412 | packages, | ||
408 | toolchain_packages) | 413 | toolchain_packages) |
409 | 414 | ||
410 | def get_parameters_sync(self): | 415 | def get_parameters_sync(self): |
@@ -690,7 +695,11 @@ class Builder(gtk.Window): | |||
690 | elif self.current_step == self.IMAGE_GENERATING: | 695 | elif self.current_step == self.IMAGE_GENERATING: |
691 | fraction = 1.0 | 696 | fraction = 1.0 |
692 | self.parameters.image_names = [] | 697 | self.parameters.image_names = [] |
693 | linkname = 'hob-image-' + self.configuration.curr_mach | 698 | selected_image = self.recipe_model.get_selected_image() |
699 | if selected_image == self.recipe_model.__dummy_image__: | ||
700 | linkname = 'hob-image-' + self.configuration.curr_mach | ||
701 | else: | ||
702 | linkname = selected_image + '-' + self.configuration.curr_mach | ||
694 | for image_type in self.parameters.image_types: | 703 | for image_type in self.parameters.image_types: |
695 | linkpath = self.parameters.image_addr + '/' + linkname + '.' + image_type | 704 | linkpath = self.parameters.image_addr + '/' + linkname + '.' + image_type |
696 | if os.path.exists(linkpath): | 705 | if os.path.exists(linkpath): |