diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-07-27 16:10:39 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-01 16:49:09 +0100 |
commit | 42fe3c613153c8abfa9cba4307919a69778fe739 (patch) | |
tree | 8266a632fa3120957887418ba2b5c693105f2346 /bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |
parent | a10fb4f72a3a072baf8d50f5a9c1dff93320a5ed (diff) | |
download | poky-42fe3c613153c8abfa9cba4307919a69778fe739.tar.gz |
hob: more reliable disabling of GPLv3 packages
1. reflect GPLv3's presence in INCOMPATIBLE_LICENSE value in the UI
The hob UI currently only supports GPLv3 as a value for
INCOMPATIBLE_LICENSE but doesn't properly reflect whether the value is
already set. This patch rectifies this.
2. don't stomp over other INCOMPATIBLE_LICENSE values when disabling GPLv3
In case the user has other values set for INCOMPATIBLE_LICENSE we don't
want to overwrite the value, we want to modify it.
Fixes [#1286]
(Bitbake rev: 68b992922bc7148d657a1c706c6acc67812a87c0)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hobeventhandler.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 4897bccd26..c6ac7d5499 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -65,7 +65,6 @@ class HobHandler(gobject.GObject): | |||
65 | 65 | ||
66 | self.current_command = None | 66 | self.current_command = None |
67 | self.building = None | 67 | self.building = None |
68 | self.gplv3_excluded = False | ||
69 | self.build_toolchain = False | 68 | self.build_toolchain = False |
70 | self.build_toolchain_headers = False | 69 | self.build_toolchain_headers = False |
71 | self.generating = False | 70 | self.generating = False |
@@ -269,13 +268,8 @@ class HobHandler(gobject.GObject): | |||
269 | # leave the workdir in a usable state | 268 | # leave the workdir in a usable state |
270 | self.server.runCommand(["stateShutdown"]) | 269 | self.server.runCommand(["stateShutdown"]) |
271 | 270 | ||
272 | def toggle_gplv3(self, excluded): | 271 | def set_incompatible_license(self, incompatible): |
273 | if self.gplv3_excluded != excluded: | 272 | self.server.runCommand(["setVariable", "INCOMPATIBLE_LICENSE", incompatible]) |
274 | self.gplv3_excluded = excluded | ||
275 | if excluded: | ||
276 | self.server.runCommand(["setVariable", "INCOMPATIBLE_LICENSE", "GPLv3"]) | ||
277 | else: | ||
278 | self.server.runCommand(["setVariable", "INCOMPATIBLE_LICENSE", ""]) | ||
279 | 273 | ||
280 | def toggle_toolchain(self, enabled): | 274 | def toggle_toolchain(self, enabled): |
281 | if self.build_toolchain != enabled: | 275 | if self.build_toolchain != enabled: |