Hob: Define a variable to store the image name and toolchain

(Bitbake rev: d0b64d901b33c9e5247dbb2b05c89a1d65abbf8b)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 12 insertions, 5 deletions

diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 9e234f51f4..7deffdc145 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -221,6 +221,9 @@ class Builder(gtk.Window):
     def __init__(self, hobHandler, recipe_model, package_model):
         super(Builder, self).__init__()
 
+        self.hob_image = "hob-image"
+        self.hob_toolchain = "hob-toolchain"
+
         # handler
         self.handler = hobHandler
 
@@ -435,8 +438,10 @@ class Builder(gtk.Window):
         self.set_user_config()
         all_packages = self.package_model.get_selected_packages()
         self.handler.reset_build()
-        self.handler.generate_image(all_packages, self.configuration.toolchain_build)
-
+        self.handler.generate_image(all_packages,
+                                    self.hob_image,
+                                    self.hob_toolchain,
+                                    self.configuration.toolchain_build)
 
     # Callback Functions
     def handler_config_updated_cb(self, handler, which, values):
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 1cbb0274c6..e5e0b4243d 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -128,13 +128,13 @@ class HobHandler(gobject.GObject):
         elif next_command == self.SUB_BUILD_IMAGE:
             self.clear_busy()
             self.building = True
-            targets = ["hob-image"]
+            targets = [self.hob_image]
             self.server.runCommand(["setVariable", "LINGUAS_INSTALL", ""])
             self.server.runCommand(["setVariable", "PACKAGE_INSTALL", " ".join(self.package_queue)])
             if self.toolchain_build:
                 pkgs = self.package_queue + [i+'-dev' for i in self.package_queue] + [i+'-dbg' for i in self.package_queue]
                 self.server.runCommand(["setVariable", "TOOLCHAIN_TARGET_TASK", " ".join(pkgs)])
-                targets.append("hob-toolchain")
+                targets.append(self.hob_toolchain)
             self.server.runCommand(["buildTargets", targets, "build"])
 
     def handle_event(self, event):
@@ -351,8 +351,10 @@ class HobHandler(gobject.GObject):
         self.commands_async.append(self.SUB_BUILD_RECIPES)
         self.run_next_command(self.GENERATE_PACKAGES)
 
-    def generate_image(self, tgts, toolchain_build=False):
+    def generate_image(self, tgts, hob_image, hob_toolchain, toolchain_build=False):
         self.package_queue = tgts
+        self.hob_image = hob_image
+        self.hob_toolchain = hob_toolchain
         self.toolchain_build = toolchain_build
         self.commands_async.append(self.SUB_PARSE_CONFIG)
         self.commands_async.append(self.SUB_BUILD_IMAGE)