diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hobeventhandler.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 16 |
1 files changed, 8 insertions, 8 deletions
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 |