From 6638a7289e63a62878a70afa1f79616e3e8097cb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Feb 2021 15:05:24 +0000 Subject: licenses: Fix canonical license for 'or-later' handling GPLv2 and GPLv2+ are two difference licenses with different meanings and we can't just pretend they're the same thing. Change the code to treat them separately. (From OE-Core rev: d1baf74ac92fe0c8c32dff101fd77d77f70fd583) Signed-off-by: Richard Purdie --- meta/lib/oe/license.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'meta/lib/oe/license.py') diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index c1274a61de..665d32ecbb 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py @@ -10,14 +10,7 @@ from fnmatch import fnmatchcase as fnmatch def license_ok(license, dont_want_licenses): """ Return False if License exist in dont_want_licenses else True """ for dwl in dont_want_licenses: - # If you want to exclude license named generically 'X', we - # surely want to exclude 'X+' as well. In consequence, we - # will exclude a trailing '+' character from LICENSE in - # case INCOMPATIBLE_LICENSE is not a 'X+' license. - lic = license - if not re.search(r'\+$', dwl): - lic = re.sub(r'\+', '', license) - if fnmatch(lic, dwl): + if fnmatch(license, dwl): return False return True -- cgit v1.2.3-54-g00ecf