diff options
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 3d5df9e6e6..74081dcc84 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
| @@ -382,6 +382,13 @@ class HobHandler(gobject.GObject): | |||
| 382 | def reset_build(self): | 382 | def reset_build(self): |
| 383 | self.build.reset() | 383 | self.build.reset() |
| 384 | 384 | ||
| 385 | def _remove_redundant(self, string): | ||
| 386 | ret = [] | ||
| 387 | for i in string.split(): | ||
| 388 | if i not in ret: | ||
| 389 | ret.append(i) | ||
| 390 | return " ".join(ret) | ||
| 391 | |||
| 385 | def get_parameters(self): | 392 | def get_parameters(self): |
| 386 | # retrieve the parameters from bitbake | 393 | # retrieve the parameters from bitbake |
| 387 | params = {} | 394 | params = {} |
| @@ -445,19 +452,19 @@ class HobHandler(gobject.GObject): | |||
| 445 | image_overhead_factor = float(image_overhead_factor) | 452 | image_overhead_factor = float(image_overhead_factor) |
| 446 | params['image_overhead_factor'] = image_overhead_factor | 453 | params['image_overhead_factor'] = image_overhead_factor |
| 447 | 454 | ||
| 448 | params["incompat_license"] = self.server.runCommand(["getVariable", "INCOMPATIBLE_LICENSE"]) or "" | 455 | params["incompat_license"] = self._remove_redundant(self.server.runCommand(["getVariable", "INCOMPATIBLE_LICENSE"]) or "") |
| 449 | params["sdk_machine"] = self.server.runCommand(["getVariable", "SDKMACHINE"]) or self.server.runCommand(["getVariable", "SDK_ARCH"]) or "" | 456 | params["sdk_machine"] = self.server.runCommand(["getVariable", "SDKMACHINE"]) or self.server.runCommand(["getVariable", "SDK_ARCH"]) or "" |
| 450 | 457 | ||
| 451 | params["image_fstypes"] = self.server.runCommand(["getVariable", "IMAGE_FSTYPES"]) or "" | 458 | params["image_fstypes"] = self._remove_redundant(self.server.runCommand(["getVariable", "IMAGE_FSTYPES"]) or "") |
| 452 | 459 | ||
| 453 | params["image_types"] = self.server.runCommand(["getVariable", "IMAGE_TYPES"]) or "" | 460 | params["image_types"] = self._remove_redundant(self.server.runCommand(["getVariable", "IMAGE_TYPES"]) or "") |
| 454 | 461 | ||
| 455 | params["conf_version"] = self.server.runCommand(["getVariable", "CONF_VERSION"]) or "" | 462 | params["conf_version"] = self.server.runCommand(["getVariable", "CONF_VERSION"]) or "" |
| 456 | params["lconf_version"] = self.server.runCommand(["getVariable", "LCONF_VERSION"]) or "" | 463 | params["lconf_version"] = self.server.runCommand(["getVariable", "LCONF_VERSION"]) or "" |
| 457 | 464 | ||
| 458 | params["runnable_image_types"] = self.server.runCommand(["getVariable", "RUNNABLE_IMAGE_TYPES"]) or "" | 465 | params["runnable_image_types"] = self._remove_redundant(self.server.runCommand(["getVariable", "RUNNABLE_IMAGE_TYPES"]) or "") |
| 459 | params["runnable_machine_patterns"] = self.server.runCommand(["getVariable", "RUNNABLE_MACHINE_PATTERNS"]) or "" | 466 | params["runnable_machine_patterns"] = self._remove_redundant(self.server.runCommand(["getVariable", "RUNNABLE_MACHINE_PATTERNS"]) or "") |
| 460 | params["deployable_image_types"] = self.server.runCommand(["getVariable", "DEPLOYABLE_IMAGE_TYPES"]) or "" | 467 | params["deployable_image_types"] = self._remove_redundant(self.server.runCommand(["getVariable", "DEPLOYABLE_IMAGE_TYPES"]) or "") |
| 461 | params["tmpdir"] = self.server.runCommand(["getVariable", "TMPDIR"]) or "" | 468 | params["tmpdir"] = self.server.runCommand(["getVariable", "TMPDIR"]) or "" |
| 462 | params["distro_version"] = self.server.runCommand(["getVariable", "DISTRO_VERSION"]) or "" | 469 | params["distro_version"] = self.server.runCommand(["getVariable", "DISTRO_VERSION"]) or "" |
| 463 | params["target_os"] = self.server.runCommand(["getVariable", "TARGET_OS"]) or "" | 470 | params["target_os"] = self.server.runCommand(["getVariable", "TARGET_OS"]) or "" |
