sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Hob: Use BB_DEFAULT_TASK as build task instead of hardcoded "build" 

Originally we use hardcoded "build" as the default task. This commit
fixes it by using BB_DEFAULT_TASK.

This fixes [YOCTO #2283]

(Bitbake rev: 7540f8d446345559ea9b47f4ff71d203ffdfaf8d)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu 2012-04-13 01:14:14 +08:00 committed by Richard Purdie
parent fdb2027e6d
commit 276b86509b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/bb/ui/crumbs/builder.py
View File

@ -71,6 +71,8 @@ class Configuration:
self.user_selected_packages = []
self.default_task = params["default_task"]
# proxy settings
self.all_proxy = params["all_proxy"]
self.http_proxy = params["http_proxy"]
@ -105,6 +107,7 @@ class Configuration:
self.tune_pkgarch = params["tune_pkgarch"]
# bblayers.conf
self.layers = params["layer"].split()
self.default_task = params["default_task"]
def load(self, template):
self.curr_mach = template.getVar("MACHINE")
@ -383,7 +386,7 @@ class Builder(gtk.Window):
_, all_recipes = self.recipe_model.get_selected_recipes()
self.set_user_config()
self.handler.reset_build()
self.handler.generate_packages(all_recipes)
self.handler.generate_packages(all_recipes, self.configuration.default_task)
def fast_generate_image_async(self):
self.switch_page(self.FAST_IMAGE_GENERATING)
@ -391,7 +394,7 @@ class Builder(gtk.Window):
_, all_recipes = self.recipe_model.get_selected_recipes()
self.set_user_config()
self.handler.reset_build()
self.handler.generate_packages(all_recipes)
self.handler.generate_packages(all_recipes, self.configuration.default_task)
def generate_image_async(self):
self.switch_page(self.IMAGE_GENERATING)
@ -410,7 +413,8 @@ class Builder(gtk.Window):
self.handler.generate_image(image,
self.hob_toolchain,
packages,
toolchain_packages)
toolchain_packages,
self.configuration.default_task)
def get_parameters_sync(self):
return self.handler.get_parameters()

12
bitbake/lib/bb/ui/crumbs/hobeventhandler.py
View File

@ -123,7 +123,7 @@ class HobHandler(gobject.GObject):
elif next_command == self.SUB_BUILD_RECIPES:
self.clear_busy()
self.building = True
self.server.runCommand(["buildTargets", self.recipe_queue, "build"])
self.server.runCommand(["buildTargets", self.recipe_queue, self.default_task])
self.recipe_queue = []
elif next_command == self.SUB_BUILD_IMAGE:
self.clear_busy()
@ -135,7 +135,7 @@ class HobHandler(gobject.GObject):
if self.toolchain_packages:
self.server.runCommand(["setVariable", "TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages)])
targets.append(self.toolchain)
self.server.runCommand(["buildTargets", targets, "build"])
self.server.runCommand(["buildTargets", targets, self.default_task])
def handle_event(self, event):
if not event:
@ -345,19 +345,21 @@ class HobHandler(gobject.GObject):
self.commands_async.append(self.SUB_GNERATE_TGTS)
self.run_next_command(self.GENERATE_RECIPES)
def generate_packages(self, tgts):
def generate_packages(self, tgts, default_task="build"):
targets = []
targets.extend(tgts)
self.recipe_queue = targets
self.default_task = default_task
self.commands_async.append(self.SUB_PARSE_CONFIG)
self.commands_async.append(self.SUB_BUILD_RECIPES)
self.run_next_command(self.GENERATE_PACKAGES)
def generate_image(self, image, toolchain, image_packages=[], toolchain_packages=[]):
def generate_image(self, image, toolchain, image_packages=[], toolchain_packages=[], default_task="build"):
self.image = image
self.toolchain = toolchain
self.package_queue = image_packages
self.toolchain_packages = toolchain_packages
self.default_task = default_task
self.commands_async.append(self.SUB_PARSE_CONFIG)
self.commands_async.append(self.SUB_BUILD_IMAGE)
self.run_next_command(self.GENERATE_IMAGE)
@ -495,6 +497,8 @@ class HobHandler(gobject.GObject):
params["bb_version"] = self.server.runCommand(["getVariable", "BB_MIN_VERSION"]) or ""
params["tune_arch"] = self.server.runCommand(["getVariable", "TUNE_ARCH"]) or ""
params["default_task"] = self.server.runCommand(["getVariable", "BB_DEFAULT_TASK"]) or "build"
params["git_proxy_host"] = self.server.runCommand(["getVariable", "GIT_PROXY_HOST"]) or ""
params["git_proxy_port"] = self.server.runCommand(["getVariable", "GIT_PROXY_PORT"]) or ""