From 42fe3c613153c8abfa9cba4307919a69778fe739 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 27 Jul 2011 16:10:39 -0700 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'bitbake/lib/bb/ui/crumbs/hobeventhandler.py') 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): self.current_command = None self.building = None - self.gplv3_excluded = False self.build_toolchain = False self.build_toolchain_headers = False self.generating = False @@ -269,13 +268,8 @@ class HobHandler(gobject.GObject): # leave the workdir in a usable state self.server.runCommand(["stateShutdown"]) - def toggle_gplv3(self, excluded): - if self.gplv3_excluded != excluded: - self.gplv3_excluded = excluded - if excluded: - self.server.runCommand(["setVariable", "INCOMPATIBLE_LICENSE", "GPLv3"]) - else: - self.server.runCommand(["setVariable", "INCOMPATIBLE_LICENSE", ""]) + def set_incompatible_license(self, incompatible): + self.server.runCommand(["setVariable", "INCOMPATIBLE_LICENSE", incompatible]) def toggle_toolchain(self, enabled): if self.build_toolchain != enabled: -- cgit v1.2.3-54-g00ecf