From: "Peter Kjellerstedt" <peter.kjellerstedt@axis.com>
To: Meh Mbeh Ida Delphine <idadelm@gmail.com>,
"openembedded-core@lists.openembedded.org"
<openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [poky-contrib][RFC PATCH 4/5] license.bbclass: Add functions to split and canonicalise license strings
Date: Wed, 17 Feb 2021 15:04:14 +0000 [thread overview]
Message-ID: <2efffee96fae455b8cdb77d47c576bfe@XBOX03.axis.com> (raw)
In-Reply-To: <20210217040033.21541-5-idadelm@gmail.com>
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Meh Mbeh Ida Delphine
> Sent: den 17 februari 2021 05:01
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [poky-contrib][RFC PATCH 4/5] license.bbclass: Add
> functions to split and canonicalise license strings
>
> These functions that will later be used in package.bbclass simply make the
> source and recipe licenses in the same format so that they can easily be
> compared and the ouput warnings filtered accordingly.
> split_spdx_lic() splits the license strings and returns a set of the
> canonicalised licenses.
> rem_false_lics() does two things:
> - Converts '-or-later' licenses to their canonicalised form
> - Gets rid of "WITH Linux-syscall-note" from license string if specified
> in local.conf
>
> Signed-off-by: Ida Delphine <idadelm@gmail.com>
> ---
> meta/classes/license.bbclass | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index dc91118340..576464cb26 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -435,3 +435,30 @@ python do_populate_lic_setscene () {
> sstate_setscene(d)
> }
> addtask do_populate_lic_setscene
> +
> +
> +def split_spdx_lic(d, licensestr):
> + """
> + Split the license strings and returns a set of the
> + canonicalised licenses.
> + """
> + import oe.license
> + split_lic = oe.license.list_licenses(licensestr)
> + spdx_lic = set([canonical_license(d, l) for l in split_lic])
> + return spdx_lic
> +
> +def rem_false_lics(d, pkglic):
> + pkglicsperpkg = set([])
> + for l in pkglic:
> + if l.endswith('-or-later'):
> + # Converts '-or-later' licenses to their canonicalised form
> + lic_ = l.replace('-or-later', '+')
Given that licenses such as "GPL-2.0+" are deprecated by SPDX, shouldn't we
instead introduce the canonical "GPL-2.0-only" and "GPL-2.0-or-later"?
And then add mappings for, e.g., "GPL-2.0" to "GPL-2.0-only" and "GPL-2.0+"
to "GPL-2.0-or-later".
> + pkglicsperpkg.add(lic_)
> + elif l.endswith(' WITH Linux-syscall-note'):
> + # Gets rid of "WITH Linux-syscall-note from license sring"
> + if d.getVar("LICENSE_WITH_LINUX_SYS") == "1":
> + lic_ = l.replace(' WITH Linux-syscall-note', '')
Looking at https://spdx.org/licenses/exceptions-index.html, there is a long
list of predefined exceptions and "Linux-syscall-note" is just one of them.
We probably want a more generic solution for how to handle exceptions.
> + pkglicsperpkg.add(lic_)
> + else:
> + pkglicsperpkg.add(l)
> + return pkglicsperpkg
> \ No newline at end of file
> --
> 2.25.1
//Peter
next prev parent reply other threads:[~2021-02-17 15:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 4:00 [poky-contrib][RFC PATCH 0/5] Suggestions for improvements? Meh Mbeh Ida Delphine
2021-02-17 4:00 ` [poky-contrib][RFC PATCH 1/5] package: Remove false positive lic warnings Meh Mbeh Ida Delphine
2021-02-17 10:42 ` [OE-core] " Richard Purdie
2021-02-17 4:00 ` [poky-contrib][RFC PATCH 2/5] " Meh Mbeh Ida Delphine
2021-02-17 10:39 ` [OE-core] " Richard Purdie
2021-02-17 14:55 ` Peter Kjellerstedt
2021-02-17 15:04 ` Richard Purdie
2021-02-17 4:00 ` [poky-contrib][RFC PATCH 3/5] " Meh Mbeh Ida Delphine
2021-02-17 4:00 ` [poky-contrib][RFC PATCH 4/5] license.bbclass: Add functions to split and canonicalise license strings Meh Mbeh Ida Delphine
2021-02-17 10:45 ` [OE-core] " Richard Purdie
2021-02-17 15:04 ` Peter Kjellerstedt [this message]
2021-02-17 16:36 ` Richard Purdie
2021-02-17 16:55 ` Meh Mbeh Ida Delphine
2021-02-17 20:51 ` Richard Purdie
2021-02-21 3:04 ` Meh Mbeh Ida Delphine
2021-02-21 11:21 ` Richard Purdie
2021-02-17 4:00 ` [poky-contrib][RFC PATCH 5/5] package.bbclass: Remove false positive license warnings Meh Mbeh Ida Delphine
2021-02-17 15:50 ` [OE-core] [poky-contrib][RFC PATCH 0/5] Suggestions for improvements? Peter Kjellerstedt
2021-02-17 16:58 ` Meh Mbeh Ida Delphine
2021-02-18 11:17 ` Peter Kjellerstedt
2021-02-18 12:21 ` Meh Mbeh Ida Delphine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2efffee96fae455b8cdb77d47c576bfe@XBOX03.axis.com \
--to=peter.kjellerstedt@axis.com \
--cc=idadelm@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox