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/hob.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/ui/hob.py') diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py index 90d5c5aa90..a5a29603c5 100644 --- a/bitbake/lib/bb/ui/hob.py +++ b/bitbake/lib/bb/ui/hob.py @@ -932,8 +932,14 @@ def main (server, eventHandler): # PACKAGE_CLASSES and that's the package manager used for the rootfs pkg, sep, pclass = pclasses[0].rpartition("_") + incompatible = server.runCommand(["getVariable", "INCOMPATIBLE_LICENSE"]) + gplv3disabled = False + if incompatible and incompatible.lower().find("gplv3"): + gplv3disabled = True + prefs = HobPrefs(configurator, handler, sdk_mach, distro, pclass, cpu_cnt, - pmake, bbthread, selected_image_types, all_image_types) + pmake, bbthread, selected_image_types, all_image_types, + gplv3disabled) layers = LayerEditor(configurator, None) window = MainWindow(taskmodel, handler, configurator, prefs, layers, mach) prefs.set_parent_window(window) -- cgit v1.2.3-54-g00ecf