diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-09-19 15:25:45 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-20 22:24:10 +0100 |
| commit | 081990b2a3d27c83f17d79265d0c77271e9d6638 (patch) | |
| tree | 16d67549a19232ce5363cf19873af6a6b41e84e6 /bitbake/lib/bb/ui/hob.py | |
| parent | 8ebca0c5a85de618b82d1c0e2f526f9c75e3ae68 (diff) | |
| download | ast2050-yocto-poky-081990b2a3d27c83f17d79265d0c77271e9d6638.zip ast2050-yocto-poky-081990b2a3d27c83f17d79265d0c77271e9d6638.tar.gz | |
hob: fix build again when building packages only
The different code paths for package vs image builds have lead to some bit
rot in the package only build and an incompatability between package only
builds and the build again mechanism.
This patch unifies the code paths and fixes build again for package only
builds.
Fixes [YOCTO #1480]
(Bitbake rev: ab6c63f35739c30df0e8a9d0f1ae982b96e538ed)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/hob.py')
| -rw-r--r-- | bitbake/lib/bb/ui/hob.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py index 51a995e..0f738ce 100644 --- a/bitbake/lib/bb/ui/hob.py +++ b/bitbake/lib/bb/ui/hob.py @@ -459,6 +459,9 @@ class MainWindow (gtk.Window): image_name = recipepath.rstrip(".bb") path, sep, image_name = image_name.rpartition("/") + image = [] + image.append(image_name) + rep.writeRecipe(recipepath, self.model) # In the case where we saved the file for the purpose of building # it we should then delete it so that the users workspace doesn't @@ -466,9 +469,9 @@ class MainWindow (gtk.Window): if not self.save_path: self.files_to_clean.append(recipepath) - self.handler.build_image(image_name, self.configurator) + self.handler.build_targets(image, self.configurator) else: - self.handler.build_packages(self.model.get_selected_pn()) + self.handler.build_targets(self.model.get_selected_pn(), self.configurator, "packages") # Disable parts of the menu which shouldn't be used whilst building self.set_menus_sensitive(False) @@ -490,7 +493,7 @@ class MainWindow (gtk.Window): def build_complete_cb(self, running_build): # Have the handler process BB events again - self.handler.building = None + self.handler.building = False self.stopping = False self.back.connect("clicked", self.back_button_clicked_cb) self.back.set_sensitive(True) @@ -504,7 +507,7 @@ class MainWindow (gtk.Window): self.files_to_clean = [] lbl = "<b>Build completed</b>\n\nClick 'Edit Image' to start another build or 'View Messages' to view the messages output during the build." - if self.handler.building == "image" and self.build_succeeded: + if self.handler.build_type == "image" and self.build_succeeded: deploy = self.handler.get_image_deploy_dir() lbl = lbl + "\n<a href=\"file://%s\" title=\"%s\">Browse folder of built images</a>." % (deploy, deploy) |
