summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hobeventhandler.py')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index c297863705..17d3fe4a05 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -123,7 +123,7 @@ class HobHandler(gobject.GObject):
123 elif next_command == self.SUB_BUILD_RECIPES: 123 elif next_command == self.SUB_BUILD_RECIPES:
124 self.clear_busy() 124 self.clear_busy()
125 self.building = True 125 self.building = True
126 self.server.runCommand(["buildTargets", self.recipe_queue, "build"]) 126 self.server.runCommand(["buildTargets", self.recipe_queue, self.default_task])
127 self.recipe_queue = [] 127 self.recipe_queue = []
128 elif next_command == self.SUB_BUILD_IMAGE: 128 elif next_command == self.SUB_BUILD_IMAGE:
129 self.clear_busy() 129 self.clear_busy()
@@ -135,7 +135,7 @@ class HobHandler(gobject.GObject):
135 if self.toolchain_packages: 135 if self.toolchain_packages:
136 self.server.runCommand(["setVariable", "TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages)]) 136 self.server.runCommand(["setVariable", "TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages)])
137 targets.append(self.toolchain) 137 targets.append(self.toolchain)
138 self.server.runCommand(["buildTargets", targets, "build"]) 138 self.server.runCommand(["buildTargets", targets, self.default_task])
139 139
140 def handle_event(self, event): 140 def handle_event(self, event):
141 if not event: 141 if not event:
@@ -345,19 +345,21 @@ class HobHandler(gobject.GObject):
345 self.commands_async.append(self.SUB_GNERATE_TGTS) 345 self.commands_async.append(self.SUB_GNERATE_TGTS)
346 self.run_next_command(self.GENERATE_RECIPES) 346 self.run_next_command(self.GENERATE_RECIPES)
347 347
348 def generate_packages(self, tgts): 348 def generate_packages(self, tgts, default_task="build"):
349 targets = [] 349 targets = []
350 targets.extend(tgts) 350 targets.extend(tgts)
351 self.recipe_queue = targets 351 self.recipe_queue = targets
352 self.default_task = default_task
352 self.commands_async.append(self.SUB_PARSE_CONFIG) 353 self.commands_async.append(self.SUB_PARSE_CONFIG)
353 self.commands_async.append(self.SUB_BUILD_RECIPES) 354 self.commands_async.append(self.SUB_BUILD_RECIPES)
354 self.run_next_command(self.GENERATE_PACKAGES) 355 self.run_next_command(self.GENERATE_PACKAGES)
355 356
356 def generate_image(self, image, toolchain, image_packages=[], toolchain_packages=[]): 357 def generate_image(self, image, toolchain, image_packages=[], toolchain_packages=[], default_task="build"):
357 self.image = image 358 self.image = image
358 self.toolchain = toolchain 359 self.toolchain = toolchain
359 self.package_queue = image_packages 360 self.package_queue = image_packages
360 self.toolchain_packages = toolchain_packages 361 self.toolchain_packages = toolchain_packages
362 self.default_task = default_task
361 self.commands_async.append(self.SUB_PARSE_CONFIG) 363 self.commands_async.append(self.SUB_PARSE_CONFIG)
362 self.commands_async.append(self.SUB_BUILD_IMAGE) 364 self.commands_async.append(self.SUB_BUILD_IMAGE)
363 self.run_next_command(self.GENERATE_IMAGE) 365 self.run_next_command(self.GENERATE_IMAGE)
@@ -495,6 +497,8 @@ class HobHandler(gobject.GObject):
495 params["bb_version"] = self.server.runCommand(["getVariable", "BB_MIN_VERSION"]) or "" 497 params["bb_version"] = self.server.runCommand(["getVariable", "BB_MIN_VERSION"]) or ""
496 params["tune_arch"] = self.server.runCommand(["getVariable", "TUNE_ARCH"]) or "" 498 params["tune_arch"] = self.server.runCommand(["getVariable", "TUNE_ARCH"]) or ""
497 499
500 params["default_task"] = self.server.runCommand(["getVariable", "BB_DEFAULT_TASK"]) or "build"
501
498 params["git_proxy_host"] = self.server.runCommand(["getVariable", "GIT_PROXY_HOST"]) or "" 502 params["git_proxy_host"] = self.server.runCommand(["getVariable", "GIT_PROXY_HOST"]) or ""
499 params["git_proxy_port"] = self.server.runCommand(["getVariable", "GIT_PROXY_PORT"]) or "" 503 params["git_proxy_port"] = self.server.runCommand(["getVariable", "GIT_PROXY_PORT"]) or ""
500 504