summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-12-11 17:48:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:22:03 +0000
commit7d5c07e4a32a0968942ae538023c2891b59d8ab5 (patch)
treeb544d24508928a051cfbc3cc2400ef5a604657a3
parentfb3405fac7b933a3f9d23e5faf6a3cf2d1990982 (diff)
downloadopenembedded-core-contrib-7d5c07e4a32a0968942ae538023c2891b59d8ab5.tar.gz
openembedded-core-contrib-7d5c07e4a32a0968942ae538023c2891b59d8ab5.tar.bz2
openembedded-core-contrib-7d5c07e4a32a0968942ae538023c2891b59d8ab5.zip
package.bbclass: Report only the licenses that are incompatible
When excluding a package from being packaged due to incompatible licenses, report the license(s) that are actually incompatible. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e0d6ff6701..ef3de35961 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1263,8 +1263,9 @@ python populate_packages () {
# Handle LICENSE_EXCLUSION
package_list = []
for pkg in packages:
- if d.getVar('LICENSE_EXCLUSION-' + pkg):
- msg = "%s has an incompatible license. Excluding from packaging." % pkg
+ licenses = d.getVar('LICENSE_EXCLUSION-' + pkg)
+ if licenses:
+ msg = "Excluding %s from packaging as it has incompatible license(s): %s" % (pkg, licenses)
package_qa_handle_error("incompatible-license", msg, d)
else:
package_list.append(pkg)