summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-10-07 14:39:05 -0700
committerSaul Wold <sgw@linux.intel.com>2010-11-14 16:50:18 -0800
commit50911329d40d277fef787b08add6d057930ea085 (patch)
tree0ad78769d678b992c1827b5d7f969d90eb9353be /meta/classes
parentddbf5e9c48afdeefeaec120a02d43536f5fd1ce1 (diff)
downloadopenembedded-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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass9
1 files changed, 5 insertions, 4 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):