diff options
| author | Saul Wold <Saul.Wold@intel.com> | 2010-10-07 14:39:05 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2010-11-14 16:50:18 -0800 |
| commit | 50911329d40d277fef787b08add6d057930ea085 (patch) | |
| tree | 0ad78769d678b992c1827b5d7f969d90eb9353be | |
| parent | ddbf5e9c48afdeefeaec120a02d43536f5fd1ce1 (diff) | |
| download | openembedded-core-50911329d40d277fef787b08add6d057930ea085.tar.gz openembedded-core-50911329d40d277fef787b08add6d057930ea085.tar.bz2 openembedded-core-50911329d40d277fef787b08add6d057930ea085.tar.xz openembedded-core-50911329d40d277fef787b08add6d057930ea085.zip | |
base.bbclass/poky.conf: Fix INCOMPATIBLE_LICENSE Whitelist checking
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
| -rw-r--r-- | meta/classes/base.bbclass | 9 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 380a53b4a..384e723cf 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -494,10 +494,11 @@ python () { dont_want_license = bb.data.getVar('INCOMPATIBLE_LICENSE', d, 1) if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate"): - gplv3_hosttools_whitelist = (bb.data.getVar("GPLv3_HOSTTOOLS_WHITELIST", d, 1) or "").split() - gplv3_lgplv2_whitelist = (bb.data.getVar("GPLv3_LGPLv2_WHITELIST", d, 1) or "").split() - gplv3_whitelist = (bb.data.getVar("GPLv3_WHITELIST", d, 1) or "").split() - if pn not in gplv3_hosttools_whitelist and pn not in gplv3_lgplv2_whitelist and pn not in gplv3_whitelist: + hosttools_whitelist = (bb.data.getVar('HOSTTOOLS_WHITELIST_%s' % dont_want_license, d, 1) or "").split() + lgplv2_whitelist = (bb.data.getVar('LGPLv2_WHITELIST_%s' % dont_want_license, d, 1) or "").split() + dont_want_whitelist = (bb.data.getVar('WHITELIST_%s' % dont_want_license, d, 1) or "").split() + if pn not in hosttools_whitelist and pn not in lgplv2_whitelist and pn not in dont_want_whitelist: + import re this_license = bb.data.getVar('LICENSE', d, 1) if this_license and re.search(dont_want_license, this_license): diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 8cc734e8a..b3c9f1aea 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -122,9 +122,9 @@ EXTRAOPKGCONFIG = "poky-feed-config-opkg" # This is a list of packages that are used by poky to build the distribution, they are not # directly part of the distribution. -GPLv3_HOSTTOOLS_WHITELIST = "" -GPLv3_WHITELIST = "less gnome-common" -GPLv3_LGPLv2_WHITELIST = "libassuan gnutls libtasn1 libidn" +HOSTTOOLS_WHITELIST_GPLv3 = "" +WHITELIST_GPLv3 = "less gnome-common" +LGPLv2_WHITELIST_GPLv3 = "libassuan gnutls libtasn1 libidn" # This is a list of packages that require a commercial license to ship # product. If shipped as part of an image these packages may have |