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/hob.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/hob.py')
-rw-r--r-- | bitbake/lib/bb/ui/hob.py | 8 |
1 files changed, 7 insertions, 1 deletions
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): | |||
932 | # PACKAGE_CLASSES and that's the package manager used for the rootfs | 932 | # PACKAGE_CLASSES and that's the package manager used for the rootfs |
933 | pkg, sep, pclass = pclasses[0].rpartition("_") | 933 | pkg, sep, pclass = pclasses[0].rpartition("_") |
934 | 934 | ||
935 | incompatible = server.runCommand(["getVariable", "INCOMPATIBLE_LICENSE"]) | ||
936 | gplv3disabled = False | ||
937 | if incompatible and incompatible.lower().find("gplv3"): | ||
938 | gplv3disabled = True | ||
939 | |||
935 | prefs = HobPrefs(configurator, handler, sdk_mach, distro, pclass, cpu_cnt, | 940 | prefs = HobPrefs(configurator, handler, sdk_mach, distro, pclass, cpu_cnt, |
936 | pmake, bbthread, selected_image_types, all_image_types) | 941 | pmake, bbthread, selected_image_types, all_image_types, |
942 | gplv3disabled) | ||
937 | layers = LayerEditor(configurator, None) | 943 | layers = LayerEditor(configurator, None) |
938 | window = MainWindow(taskmodel, handler, configurator, prefs, layers, mach) | 944 | window = MainWindow(taskmodel, handler, configurator, prefs, layers, mach) |
939 | prefs.set_parent_window(window) | 945 | prefs.set_parent_window(window) |