From: Richard Purdie Date: Thu, 18 Feb 2021 15:08:49 +0000 (+0000) Subject: license_image: Don't canonicalise INCOMPATIBLE_LICENSE X-Git-Tag: yocto-3.3~439 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=957f48ce78ad1865653e8b8f25909a65ba8fc535;p=openembedded-core.git 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 --- 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 = []