diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-18 15:08:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-21 21:59:52 +0000 |
commit | 957f48ce78ad1865653e8b8f25909a65ba8fc535 (patch) | |
tree | 7ac1126fbed4b3961b2ba08c144eb75775c8c120 | |
parent | 08cbf17485b6443a6118acfac8200eb6c61445a3 (diff) | |
download | openembedded-core-contrib-957f48ce78ad1865653e8b8f25909a65ba8fc535.tar.gz |
license_image: Don't canonicalise INCOMPATIBLE_LICENSE
The code internally correctly handles canonicalisation of these license
fields, we shouldn't call it manually. The issue is that the fields can
contain wildcards and GPLv3* means something quite different to GPLv3-only*.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/license_image.bbclass | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 36ddd84805..c96b032ebd 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -40,7 +40,6 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): import stat bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split() - bad_licenses = [canonical_license(d, l) for l in bad_licenses] bad_licenses = expand_wildcard_licenses(d, bad_licenses) whitelist = [] |