> -----Original Message-----
> From: [email protected] <openembedded-
> [email protected]> On Behalf Of Richard Purdie
> Sent: den 2 mars 2022 00:42
> To: [email protected]
> Subject: [OE-core] [PATCH 4/4] license: Rework INCOMPATIBLE_LICENSE
> wildcard handling
>
> The current wildcard handling is badly documented and inconsistently
> used and understood.
>
> Forcing users to have to use "GPL-3.0-only GPL-3.0-or-later" whilst
> explict is not very user friendly. Equally, using the current wildcards
> is ambigious. This supports pre-defined expansions only and at least makes
> it clear what GPL-3.0* means (it doesn't include the exception licenses).
>
> This is hopefully an acceptable compromise between literal meaning and
> having something usable.
>
> Non-SPDX forms of license in this field have been dropped and errors are
> shown for unsupported expansions and unsupported old style license terms.
>
> Users need to carefully consider how to migrate to the new syntax but
> the meaning should be well defined and clear from here forward.
>
> Signed-off-by: Richard Purdie <[email protected]>
> ---
> meta/classes/license.bbclass | 41 +++++----
> .../oeqa/selftest/cases/incompatible_lic.py | 86 +++++++++++--------
> 2 files changed, 70 insertions(+), 57 deletions(-)
>
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index 68c022248c8..cb1f46983ac 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -277,28 +277,27 @@ AVAILABLE_LICENSES := "${@'
> '.join(available_licenses(d))}"
>
> def expand_wildcard_licenses(d, wildcard_licenses):
> """
> - Return actual spdx format license names if wildcards are used. We expand
> - wildcards from SPDXLICENSEMAP flags and AVAILABLE_LICENSES.
> + There are some common wildcard values users may want to use. Support them
> + here.
> """
> - import fnmatch
> -
> - licenses = wildcard_licenses[:]
> - spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys()
> - for wld_lic in wildcard_licenses:
> - spdxflags = fnmatch.filter(spdxmapkeys, wld_lic)
> - licenses += [d.getVarFlag('SPDXLICENSEMAP', flag) for flag in
> spdxflags]
> - # 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]
> -
> - spdx_lics = d.getVar('AVAILABLE_LICENSES').split()
> - for wld_lic in wildcard_licenses:
> - licenses += fnmatch.filter(spdx_lics, wld_lic)
> -
> - licenses = list(set(licenses))
> - return licenses
> + licenses = set(wildcard_licenses)
> + mapping = {
> + "GPL-3.0*" : ["GPL-3.0-only", "GPL-3.0-or-later"],
> + "LGPL-3.0*" : ["LGPL-3.0-only", "LGPL-3.0-or-later"],
If you are adamant about using "*" in these shortcuts (which I
still think is a mistake), then you should add these two as well:
"AGPL-3.0*" : ["AGPL-3.0-only", "AGPL-3.0-or-later"],
"*GPL-3.0*" : ["GPL-3.0-only", "GPL-3.0-or-later", "LGPL-3.0-only",
"LGPL-3.0-or-later", "AGPL-3.0-only", "AGPL-3.0-or-later"],
I believe the last one is what most really want to do, i.e.,
exclude all GPL-3.0 variants.
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#162614):
https://lists.openembedded.org/g/openembedded-core/message/162614
Mute This Topic: https://lists.openembedded.org/mt/89490747/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
