diff options
| author |   Andrei Gherzan <andrei.gherzan@windriver.com> | 2012-01-10 17:17:58 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-10 17:33:22 +0000 |
| commit | 28456593be0b7e15bb51595d547d7e5347cce24b (patch) | |
| tree | 14ea2415d0027c6c5cef3ede9bbb361969fc7177 /meta/classes/base.bbclass | |
| parent | 82329c13f891939c68ec26a60a9c0a25929cd584 (diff) | |
| download | openembedded-core-contrib-28456593be0b7e15bb51595d547d7e5347cce24b.tar.gz | |
license.bbclass base.bbclass: support for 'or' operand in LICENSE and for SPDX license names
A new function was defined in license.bbclass in order to correctly exclude packages where OE-Style licence naming
is used. In this way licenses as GPL-3, GPLv3, GPLv3.0 etc will be excluded from a non-GPLv3 build. This function
takes into consideration if 'or' operand is used.
The function defined in license.bbclass is called in base.bbclass where packages are excluded based on
INCOMPATIBLE_LICENSE variable.
[YOCTO #1884]
[YOCTO #1844]
Signed-off-by: Andrei Gherzan <andrei at gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | meta/classes/base.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index e65a7220f5..f0c358ea32 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -398,9 +398,8 @@ python () { dont_want_whitelist = (d.getVar('WHITELIST_%s' % dont_want_license, 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 = d.getVar('LICENSE', 1) - if this_license and re.search(dont_want_license, this_license): + if incompatible_license(d,dont_want_license): bb.note("SKIPPING %s because it's %s" % (pn, this_license)) raise bb.parse.SkipPackage("incompatible with license %s" % this_license) |