diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-12-11 17:48:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-16 23:25:50 +0000 |
commit | 38bea41f592ebfd269a6860d24270c3dee662cbe (patch) | |
tree | 0666df3efdbf9dcf629ee0cd868f27b0e04d2edd /meta | |
parent | 5560c50316a8b2d47c4fcb51cf12ef473079ff54 (diff) | |
download | poky-38bea41f592ebfd269a6860d24270c3dee662cbe.tar.gz |
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.
(From OE-Core rev: 7d5c07e4a32a0968942ae538023c2891b59d8ab5)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package.bbclass | 5 |
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 () { | |||
1263 | # Handle LICENSE_EXCLUSION | 1263 | # Handle LICENSE_EXCLUSION |
1264 | package_list = [] | 1264 | package_list = [] |
1265 | for pkg in packages: | 1265 | for pkg in packages: |
1266 | if d.getVar('LICENSE_EXCLUSION-' + pkg): | 1266 | licenses = d.getVar('LICENSE_EXCLUSION-' + pkg) |
1267 | msg = "%s has an incompatible license. Excluding from packaging." % pkg | 1267 | if licenses: |
1268 | msg = "Excluding %s from packaging as it has incompatible license(s): %s" % (pkg, licenses) | ||
1268 | package_qa_handle_error("incompatible-license", msg, d) | 1269 | package_qa_handle_error("incompatible-license", msg, d) |
1269 | else: | 1270 | else: |
1270 | package_list.append(pkg) | 1271 | package_list.append(pkg) |