summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2014-02-25 09:15:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-25 08:06:11 +0000
commit72576e2d04dc8b43ae0d7f31cddd74318f52103e (patch)
treef1c56a610de984204185c1c55870250b1afab4db
parentfe4b1ca1188f4cb8a95dc992ec29fc0f9125e353 (diff)
downloadpoky-72576e2d04dc8b43ae0d7f31cddd74318f52103e.tar.gz
bitbake: hob: replace the use of hob-toolchain with populate_sdk task
Now bitbake has an API to run individual task for targets. Hob can use this to build the sdk, instead of using the hob- toolchain. (Bitbake rev: 4a5009036e9cb38f6e0260a88278948931073bc6) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py2
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py16
2 files changed, 8 insertions, 10 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 1e26d44f48..5ae1ddb52f 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -380,7 +380,6 @@ class Builder(gtk.Window):
380 super(Builder, self).__init__() 380 super(Builder, self).__init__()
381 381
382 self.hob_image = "hob-image" 382 self.hob_image = "hob-image"
383 self.hob_toolchain = "hob-toolchain"
384 383
385 # handler 384 # handler
386 self.handler = hobHandler 385 self.handler = hobHandler
@@ -597,7 +596,6 @@ class Builder(gtk.Window):
597 image = self.configuration.selected_image 596 image = self.configuration.selected_image
598 self.handler.generate_image(image, 597 self.handler.generate_image(image,
599 base_image, 598 base_image,
600 self.hob_toolchain,
601 packages, 599 packages,
602 toolchain_packages, 600 toolchain_packages,
603 self.configuration.default_task) 601 self.configuration.default_task)
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 379232849b..128207092d 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -164,18 +164,19 @@ class HobHandler(gobject.GObject):
164 elif next_command == self.SUB_BUILD_IMAGE: 164 elif next_command == self.SUB_BUILD_IMAGE:
165 self.clear_busy() 165 self.clear_busy()
166 self.building = True 166 self.building = True
167 targets = [self.image] 167 target = self.image
168 if self.toolchain_packages: 168 if target == "hob-image":
169 self.set_var_in_file("TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages), "local.conf")
170 targets.append(self.toolchain)
171 if targets[0] == "hob-image":
172 self.set_var_in_file("LINGUAS_INSTALL", "", "local.conf") 169 self.set_var_in_file("LINGUAS_INSTALL", "", "local.conf")
173 hobImage = self.runCommand(["matchFile", "hob-image.bb"]) 170 hobImage = self.runCommand(["matchFile", "hob-image.bb"])
174 if self.base_image != "Start with an empty image recipe": 171 if self.base_image != "Start with an empty image recipe":
175 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"]) 172 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])
176 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True, ""]) 173 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True, ""])
177 targets[0] += version 174 target += version
178 self.recipe_model.set_custom_image_version(version) 175 self.recipe_model.set_custom_image_version(version)
176 targets = [target]
177 if self.toolchain_packages:
178 self.set_var_in_file("TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages), "local.conf")
179 targets.append(target + ":do_populate_sdk")
179 180
180 self.runCommand(["buildTargets", targets, self.default_task]) 181 self.runCommand(["buildTargets", targets, self.default_task])
181 182
@@ -423,10 +424,9 @@ class HobHandler(gobject.GObject):
423 self.commands_async.append(self.SUB_BUILD_RECIPES) 424 self.commands_async.append(self.SUB_BUILD_RECIPES)
424 self.run_next_command(self.GENERATE_PACKAGES) 425 self.run_next_command(self.GENERATE_PACKAGES)
425 426
426 def generate_image(self, image, base_image, toolchain, image_packages=[], toolchain_packages=[], default_task="build"): 427 def generate_image(self, image, base_image, image_packages=[], toolchain_packages=[], default_task="build"):
427 self.image = image 428 self.image = image
428 self.base_image = base_image 429 self.base_image = base_image
429 self.toolchain = toolchain
430 self.package_queue = image_packages 430 self.package_queue = image_packages
431 self.toolchain_packages = toolchain_packages 431 self.toolchain_packages = toolchain_packages
432 self.default_task = default_task 432 self.default_task = default_task