[oe-commits] [openembedded-core] 02/32: license: simple verification of LICENSE_<pkg> values
git at git.openembedded.org
git at git.openembedded.org
Tue Aug 23 09:12:17 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 9151ae074165a7ceb8bb521ed3a1c731cb94778d
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Wed Aug 3 16:32:15 2016 +0300
license: simple verification of LICENSE_<pkg> values
LICENSE should be a superset of all LICENSE_<pkg> values. That is,
LICENSE should contain all licenses and LICENSE_<pkg> can be used to
"filter" this on a per-package basis. LICENSE_<pkg> shouldn't contain
anything that isn't specified in LICENSE.
This patch implements simple checking of LICENSE_<pkg> values. It does
do not do advanced parsing/matching of license expressions, but,
checks that all licenses mentioned in LICENSE_<pkg> are also specified in
LICENSE. A warning is printed if problems are found.
Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/base.bbclass | 13 +++++++++++++
meta/lib/oe/license.py | 18 ++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f2e3d40..79edfe5 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -543,6 +543,19 @@ python () {
if pn in incompatwl:
bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")
+ # Try to verify per-package (LICENSE_<pkg>) values. LICENSE should be a
+ # superset of all per-package licenses. We do not do advanced (pattern)
+ # matching of license expressions - just check that all license strings
+ # in LICENSE_<pkg> are found in LICENSE.
+ license_set = oe.license.list_licenses(license)
+ for pkg in d.getVar('PACKAGES', True).split():
+ pkg_license = d.getVar('LICENSE_' + pkg, True)
+ if pkg_license:
+ unlisted = oe.license.list_licenses(pkg_license) - license_set
+ if unlisted:
+ bb.warn("LICENSE_%s includes licenses (%s) that are not "
+ "listed in LICENSE" % (pkg, ' '.join(unlisted)))
+
needsrcrev = False
srcuri = d.getVar('SRC_URI', True)
for uri in srcuri.split():
diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
index 39ef965..8d2fd17 100644
--- a/meta/lib/oe/license.py
+++ b/meta/lib/oe/license.py
@@ -215,3 +215,21 @@ def manifest_licenses(licensestr, dont_want_licenses, canonical_license, d):
manifest.licensestr = manifest.licensestr.replace('[', '(').replace(']', ')')
return (manifest.licensestr, manifest.licenses)
+
+class ListVisitor(LicenseVisitor):
+ """Record all different licenses found in the license string"""
+ def __init__(self):
+ self.licenses = set()
+
+ def visit_Str(self, node):
+ self.licenses.add(node.s)
+
+def list_licenses(licensestr):
+ """Simply get a list of all licenses mentioned in a license string.
+ Binary operators are not applied or taken into account in any way"""
+ visitor = ListVisitor()
+ try:
+ visitor.visit_string(licensestr)
+ except SyntaxError as exc:
+ raise LicenseSyntaxError(licensestr, exc)
+ return visitor.licenses
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list