From 83766c9fffa45cd3a94cf8076f7c8f45aba11a12 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sun, 27 Feb 2022 19:21:36 +0100 Subject: meta, meta-selftest: Replace more non-SPDX license identifiers In commit ceda3238 (meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers) all LICENSE variables were updated to only use SPDX license identifiers. This does the same for comments and other variables where it is appropriate to use the official SPDX license identifiers. There are still references to, e.g., "GPLv3", but they are then typically in descriptive text where they refer to the license in a generic sense. (From OE-Core rev: 165759dced7fbe73b1db2ede67047896071dc6d0) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes/license.bbclass') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index dec9867209..68c022248c 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -193,7 +193,7 @@ def find_license_files(d): os.path.join(srcdir, non_generic_lic), None, None)) non_generic_lics[non_generic_lic] = license_type else: - # Add explicity avoid of CLOSED license because this isn't generic + # Explicitly avoid the CLOSED license because this isn't generic if license_type != 'CLOSED': # And here is where we warn people that their licenses are lousy oe.qa.handle_error("license-exists", @@ -252,7 +252,7 @@ def return_spdx(d, license): def canonical_license(d, license): """ Return the canonical (SPDX) form of the license if available (so GPLv3 - becomes GPL-3.0) or the passed license if there is no canonical form. + becomes GPL-3.0-only) or the passed license if there is no canonical form. """ return d.getVarFlag('SPDXLICENSEMAP', license) or license @@ -287,7 +287,8 @@ def expand_wildcard_licenses(d, wildcard_licenses): for wld_lic in wildcard_licenses: spdxflags = fnmatch.filter(spdxmapkeys, wld_lic) licenses += [d.getVarFlag('SPDXLICENSEMAP', flag) for flag in spdxflags] - # Assume if we're passed "GPLv3" or "*GPLv3" it means -or-later as well + # Assume that if we are passed "GPL-3.0" or "*GPL-3.0", then it means + # "-or-later" as well. if not wld_lic.endswith(("-or-later", "-only", "*", "+")): spdxflags = fnmatch.filter(spdxmapkeys, wld_lic + "+") licenses += [d.getVarFlag('SPDXLICENSEMAP', flag) for flag in spdxflags] -- cgit v1.2.3-54-g00ecf