diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hobeventhandler.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 292d9056b2..c297863705 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -128,12 +128,13 @@ class HobHandler(gobject.GObject): | |||
128 | elif next_command == self.SUB_BUILD_IMAGE: | 128 | elif next_command == self.SUB_BUILD_IMAGE: |
129 | self.clear_busy() | 129 | self.clear_busy() |
130 | self.building = True | 130 | self.building = True |
131 | targets = [self.hob_image] | 131 | targets = [self.image] |
132 | self.server.runCommand(["setVariable", "LINGUAS_INSTALL", ""]) | 132 | if self.package_queue: |
133 | self.server.runCommand(["setVariable", "PACKAGE_INSTALL", " ".join(self.package_queue)]) | 133 | self.server.runCommand(["setVariable", "LINGUAS_INSTALL", ""]) |
134 | self.server.runCommand(["setVariable", "PACKAGE_INSTALL", " ".join(self.package_queue)]) | ||
134 | if self.toolchain_packages: | 135 | if self.toolchain_packages: |
135 | self.server.runCommand(["setVariable", "TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages)]) | 136 | self.server.runCommand(["setVariable", "TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages)]) |
136 | targets.append(self.hob_toolchain) | 137 | targets.append(self.toolchain) |
137 | self.server.runCommand(["buildTargets", targets, "build"]) | 138 | self.server.runCommand(["buildTargets", targets, "build"]) |
138 | 139 | ||
139 | def handle_event(self, event): | 140 | def handle_event(self, event): |
@@ -352,10 +353,10 @@ class HobHandler(gobject.GObject): | |||
352 | self.commands_async.append(self.SUB_BUILD_RECIPES) | 353 | self.commands_async.append(self.SUB_BUILD_RECIPES) |
353 | self.run_next_command(self.GENERATE_PACKAGES) | 354 | self.run_next_command(self.GENERATE_PACKAGES) |
354 | 355 | ||
355 | def generate_image(self, tgts, hob_image, hob_toolchain, toolchain_packages=[]): | 356 | def generate_image(self, image, toolchain, image_packages=[], toolchain_packages=[]): |
356 | self.package_queue = tgts | 357 | self.image = image |
357 | self.hob_image = hob_image | 358 | self.toolchain = toolchain |
358 | self.hob_toolchain = hob_toolchain | 359 | self.package_queue = image_packages |
359 | self.toolchain_packages = toolchain_packages | 360 | self.toolchain_packages = toolchain_packages |
360 | self.commands_async.append(self.SUB_PARSE_CONFIG) | 361 | self.commands_async.append(self.SUB_PARSE_CONFIG) |
361 | self.commands_async.append(self.SUB_BUILD_IMAGE) | 362 | self.commands_async.append(self.SUB_BUILD_IMAGE) |