summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-18 15:08:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-21 22:01:28 +0000
commit3266d1ee1c02312a9b6c62a50d1f7bbc2863446f (patch)
tree28c0982cd1d3b6e5e0a0aa6bc1903fee92c3b923 /meta/classes
parent55a3da9c0de86e09e9c8182d85a0804bc8d952e4 (diff)
downloadpoky-3266d1ee1c02312a9b6c62a50d1f7bbc2863446f.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*. (From OE-Core rev: 957f48ce78ad1865653e8b8f25909a65ba8fc535) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/license_image.bbclass1
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):
40 import stat 40 import stat
41 41
42 bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split() 42 bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split()
43 bad_licenses = [canonical_license(d, l) for l in bad_licenses]
44 bad_licenses = expand_wildcard_licenses(d, bad_licenses) 43 bad_licenses = expand_wildcard_licenses(d, bad_licenses)
45 44
46 whitelist = [] 45 whitelist = []