From: "Peter Kjellerstedt" <peter.kjellerstedt@axis.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>,
Meh Mbeh Ida Delphine <idadelm@gmail.com>,
"openembedded-core@lists.openembedded.org"
<openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [poky][PATCH v3] Update license file to match current SPDX names
Date: Mon, 12 Oct 2020 21:23:58 +0000 [thread overview]
Message-ID: <5b2a61996df146de8e86474410e2a31a@XBOX03.axis.com> (raw)
In-Reply-To: <d53db65c06b96aa6d8e1ac1edb7f912da78293d3.camel@linuxfoundation.org>
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: den 10 oktober 2020 14:40
> To: Meh Mbeh Ida Delphine <idadelm@gmail.com>; openembedded-
> core@lists.openembedded.org
> Subject: Re: [OE-core] [poky][PATCH v3] Update license file to match
> current SPDX names
>
> On Sat, 2020-10-10 at 13:23 +0100, Meh Mbeh Ida Delphine wrote:
> > Updated mappings of license fields of meta/conf/licenses.conf to
> > match latest SPDX naming.
> > Added missing mappings.
> >
> > Fixes: [YOCTO #13320]
> >
> > Signed-off-by: Meh Mbeh Ida Delphine <idadelm@gmail.com>
> > ---
> >
> > Changes in V3:
> > * Added missing mappings to meta/conf/licenses.conf
> >
> > Changes in V2:
> > * Corrected the email subject line.
> >
> > meta/conf/licenses.conf | 55 ++++++++++++++++++++++++++++-----------
> > --
> > 1 file changed, 38 insertions(+), 17 deletions(-)
> >
> > diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
> > index 5b309eb385..b45a9d283e 100644
> > --- a/meta/conf/licenses.conf
> > +++ b/meta/conf/licenses.conf
> > @@ -10,33 +10,44 @@
> > # Any mapping to MPL/LGPL/GPL should be fixed
> >
> > # AGPL variations
> > -SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0"
> > -SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0"
> > -SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0"
> > +SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0-only"
> > +SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0-only"
> > +SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0-only"
> > +SPDXLICENSEMAP[AGPL-3.0] = "AGPL-3.0-only"
> >
> > # GPL variations
> > -SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
> > -SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
> > -SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
> > -SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
> > -SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
> > -SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
> > -SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
> > -SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
> > -SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
> > +SPDXLICENSEMAP[GPL-1] = "GPL-1.0-only"
> > +SPDXLICENSEMAP[GPLv1] = "GPL-1.0-only"
> > +SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0-only"
> > +SPDXLICENSEMAP[GPL-1.0] = "GPL-2.0-only"
> > +SPDXLICENSEMAP[GPL-2] = "GPL-2.0-only"
> > +SPDXLICENSEMAP[GPLv2] = "GPL-2.0-only"
> > +SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0-only"
> > +SPDXLICENSEMAP[GPL-2.0] = "GPL-2.0-only"
> > +SPDXLICENSEMAP[GPL-3] = "GPL-3.0-only"
> > +SPDXLICENSEMAP[GPLv3] = "GPL-3.0-only"
> > +SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0-only"
> > +SPDXLICENSEMAP[GPL-3.0] = "GPL-3.0-only"
> >
> > #LGPL variations
> > -SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
> > -SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
> > -SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
> > -SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
> > -SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
> > +SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only"
> > +SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only"
> > +SPDXLICENSEMAP[LGPL-2.0] = "LGPL-2.0-only"
> > +SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1-only"
> > +SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only"
> > +SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only"
> > +SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only"
> > +SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only"
>
> The above is all good, thanks.
But only a part of the full solution. In addition, the
following should be done:
* Rename (and possibly update) the actual license files in
meta/files/common-licenses to match the new canonical names.
* Add license files for GPL-2.0-or-later & co.
* Add mappings from, e.g., "GPL-2.0+" to "GPL-2.0-or-later"
to SPDXLICENSEMAP.
* Remove the code that adds support for using "<any license>+"
in LICENSE as it should no longer be needed with the new
mappings.
> > #MPL variations
> > SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
> > SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
> > +SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0"
> > SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
> > +SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1"
> > SPDXLICENSEMAP[MPLv2] = "MPL-2.0"
> > +SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0"
> > +
>
> However we don't need to add ones where the two values are the same.
>
> Cheers,
>
> Richard
//Peter
next prev parent reply other threads:[~2020-10-12 21:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-10 12:23 [poky][PATCH v3] Update license file to match current SPDX names Meh Mbeh Ida Delphine
2020-10-10 12:40 ` [OE-core] " Richard Purdie
2020-10-12 21:23 ` Peter Kjellerstedt [this message]
2020-10-12 21:27 ` Richard Purdie
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=5b2a61996df146de8e86474410e2a31a@XBOX03.axis.com \
--to=peter.kjellerstedt@axis.com \
--cc=idadelm@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.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