From 3266d1ee1c02312a9b6c62a50d1f7bbc2863446f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Feb 2021 15:08:49 +0000 Subject: 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 --- meta/classes/license_image.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'meta/classes') 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 = [] -- cgit v1.2.3-54-g00ecf