[poky,v3] Update license file to match current SPDX names

Submitted by Meh Mbeh Ida Delphine on Oct. 10, 2020, 12:23 p.m. | Patch ID: 177112

Details

Message ID 20201010122339.9594-1-idadelm@gmail.com
State Master Next
Commit db3d51ecba13ed86c87c5bf2d9d4a567739729f6
Headers show

Commit Message

Meh Mbeh Ida Delphine Oct. 10, 2020, 12:23 p.m.
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(-)

Patch hide | download patch | download mbox

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"
 
 #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"
+
 
 #MIT variations
 SPDXLICENSEMAP[MIT-X] = "MIT"
@@ -48,33 +59,43 @@  SPDXLICENSEMAP[openssl] = "OpenSSL"
 #PSF variations
 SPDXLICENSEMAP[PSF] = "PSF-2.0"
 SPDXLICENSEMAP[PSFv2] = "PSF-2.0"
+SPDXLICENSEMAP[PSF-2.0] = "PSF-2.0"
 
 #Python variations
 SPDXLICENSEMAP[Python-2] = "Python-2.0"
+SPDXLICENSEMAP[Python-2.0] = "Python-2.0"
 
 #Apache variations
 SPDXLICENSEMAP[Apachev2] = "Apache-2.0"
 SPDXLICENSEMAP[Apache-2] = "Apache-2.0"
+SPDXLICENSEMAP[Apache-2.0] = "Apache-2.0"
 
 #Artistic variations
 SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0"
 SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0"
+SPDXLICENSEMAP[Artistic-1.0] = "Artistic-1.0"
 
 #Academic variations
 SPDXLICENSEMAP[AFL-2] = "AFL-2.0"
+SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0"
 SPDXLICENSEMAP[AFL-1] = "AFL-1.2"
+SPDXLICENSEMAP[AFL-1.2] = "AFL-1.2"
 SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
+SPDXLICENSEMAP[AFL-2.0] = "AFL-2.0"
 SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
 
 #CDDL variations
 SPDXLICENSEMAP[CDDLv1] = "CDDL-1.0"
 SPDXLICENSEMAP[CDDL-1] = "CDDL-1.0"
+SPDXLICENSEMAP[CDDL-1.0] = "CDDL-1.0"
 
 #Other variations
 SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"
+SPDXLICENSEMAP[EPL-1.0] = "EPL-1.0"
 
 #Silicon Graphics variations
 SPDXLICENSEMAP[SGIv1] = "SGI-1"
+SPDXLICENSEMAP[SGI-1] = "SGI-1"
 
 # Additional license directories. Add your custom licenses directories this path.
 # LICENSE_PATH += "${COREBASE}/custom-licenses"

Comments

Richard Purdie Oct. 10, 2020, 12:40 p.m.
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.

>  #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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#143204): https://lists.openembedded.org/g/openembedded-core/message/143204
Mute This Topic: https://lists.openembedded.org/mt/77422115/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Peter Kjellerstedt Oct. 12, 2020, 9:23 p.m.
> -----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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#143258): https://lists.openembedded.org/g/openembedded-core/message/143258
Mute This Topic: https://lists.openembedded.org/mt/77422115/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Richard Purdie Oct. 12, 2020, 9:27 p.m.
On Mon, 2020-10-12 at 21:23 +0000, Peter Kjellerstedt wrote:
> > -----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.

Thanks, you're right, the patch does need to include the above.

> * 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.

I think handling the "+" versions, whilst something definitely need,
would be a separate patch building upon this one.

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#143259): https://lists.openembedded.org/g/openembedded-core/message/143259
Mute This Topic: https://lists.openembedded.org/mt/77422115/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-