Re: [OE-core] [poky-contrib][PATCH 1/4] oe.license: Add functions to split and canonicalise license strings.

["Peter Kjellerstedt" <peter.kjellerstedt@axis.com>]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Meh Mbeh Ida Delphine
> Sent: den 10 mars 2021 00:31
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [poky-contrib][PATCH 1/4] oe.license: Add functions to split and canonicalise license strings.
> 
> These functions ensures recipe LICENSE strings are split into their
> individual licenses and then canonicalised to easily enable their matching
> with licenses of sources during the packaging process.
> 
> Signed-off-by: Ida Delphine <idadelm@gmail.com>
> ---
>  meta/lib/oe/license.py | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
> index 665d32ecbb..9e9957be1d 100644
> --- a/meta/lib/oe/license.py
> +++ b/meta/lib/oe/license.py
> @@ -236,3 +236,26 @@ def list_licenses(licensestr):
>      except SyntaxError as exc:
>          raise LicenseSyntaxError(licensestr, exc)
>      return visitor.licenses
> +
> +def canonical_license(license, d):
> +    """
> +    Return the canonical (SPDX) form of the license if available (so GPLv3
> +    becomes GPL-3.0), for the license named 'X+', return canonical form of
> +    'X' if available and the tailing '+' (so GPLv3+ becomes GPL-3.0+),
> +    or the passed license if there is no canonical form.
> +    """
> +    lic = d.getVarFlag('SPDXLICENSEMAP', license) or ""
> +    if not lic and license.endswith('+'):

Do we really need this if statement now that there are entries for 
all relevant licenses that use '+' in the SPDXLICENSEMAP? Isn't it 
better to rely on the SPDXLICENSEMAP to handle any special cases 
like this than to add code all over the place to support this 
legacy way of marking licenses as "-or-later".

> +        lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'))
> +        if lic:
> +            lic += '+'
> +    return lic or license
> +
> +def split_spdx_lic(licensestr,d):
> +    """
> +    Split the license strings and returns a set of the
> +    canonicalised licenses.
> +    """
> +    split_lic = list_licenses(licensestr)
> +    spdx_lic = set([canonical_license(l, d) for l in split_lic])
> +    return spdx_lic
> \ No newline at end of file

Please add a newline on the last line.

> --
> 2.25.1

//Peter