> -----Original Message----- > From: [email protected] <openembedded- > [email protected]> On Behalf Of Richard Purdie > Sent: den 18 februari 2021 17:57 > To: [email protected] > Cc: Meh Mbeh Ida Delphine <[email protected]> > Subject: [OE-core] [PATCH 01/11] licenses: Update license file to match > current SPDX names > > From: Meh Mbeh Ida Delphine <[email protected]> > > * Updated mappings of license fields of meta/conf/licenses.conf to match > latest SPDX naming. > > * Add mappings to the old names > > * Renamed license files to match the new preferred names. > > * Added "or later" versions of license mappings > > * Added "or later" versions of common license files eg GPL-2.0-or-later > > Fixes: [YOCTO #13320] > > Signed-off-by: Meh Mbeh Ida Delphine <[email protected]> > Signed-off-by: Richard Purdie <[email protected]> > --- > meta/conf/licenses.conf | 48 +- > .../{AGPL-3.0 => AGPL-3.0-only} | 0 > meta/files/common-licenses/AGPL-3.0-or-later | 613 +++++++++++++++++ > .../common-licenses/{GPL-1.0 => GPL-1.0-only} | 0 > meta/files/common-licenses/GPL-1.0-or-later | 232 +++++++ > .../common-licenses/{GPL-2.0 => GPL-2.0-only} | 0 > meta/files/common-licenses/GPL-2.0-or-later | 319 +++++++++ > .../common-licenses/{GPL-3.0 => GPL-3.0-only} | 0 > meta/files/common-licenses/GPL-3.0-or-later | 625 ++++++++++++++++++ > .../{LGPL-2.0 => LGPL-2.0-only} | 0 > meta/files/common-licenses/LGPL-2.0-or-later | 446 +++++++++++++ > .../{LGPL-2.1 => LGPL-2.1-only} | 0 > meta/files/common-licenses/LGPL-2.1-or-later | 468 +++++++++++++ > .../{LGPL-3.0 => LGPL-3.0-only} | 0 > meta/files/common-licenses/LGPL-3.0-or-later | 163 +++++ > 15 files changed, 2897 insertions(+), 17 deletions(-) > rename meta/files/common-licenses/{AGPL-3.0 => AGPL-3.0-only} (100%) > create mode 100644 meta/files/common-licenses/AGPL-3.0-or-later > rename meta/files/common-licenses/{GPL-1.0 => GPL-1.0-only} (100%) > create mode 100644 meta/files/common-licenses/GPL-1.0-or-later > rename meta/files/common-licenses/{GPL-2.0 => GPL-2.0-only} (100%) > create mode 100644 meta/files/common-licenses/GPL-2.0-or-later > rename meta/files/common-licenses/{GPL-3.0 => GPL-3.0-only} (100%) > create mode 100644 meta/files/common-licenses/GPL-3.0-or-later > rename meta/files/common-licenses/{LGPL-2.0 => LGPL-2.0-only} (100%) > create mode 100644 meta/files/common-licenses/LGPL-2.0-or-later > rename meta/files/common-licenses/{LGPL-2.1 => LGPL-2.1-only} (100%) > create mode 100644 meta/files/common-licenses/LGPL-2.1-or-later > rename meta/files/common-licenses/{LGPL-3.0 => LGPL-3.0-only} (100%) > create mode 100644 meta/files/common-licenses/LGPL-3.0-or-later > > diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf > index 5b309eb3851..a4582b9ae82 100644 > --- a/meta/conf/licenses.conf > +++ b/meta/conf/licenses.conf > @@ -10,27 +10,41 @@ > # 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" > +SPDXLICENSEMAP[AGPL-3.0+] = "AGPL-3.0-or-later" > > # 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-1.0-or-later" > +SPDXLICENSEMAP[GPL-1.0] = "GPL-2.0-only"
Change to: SPDXLICENSEMAP[GPL-1.0] = "GPL-1.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-2.0+] = "GPL-2.0-or-later" > +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" > +SPDXLICENSEMAP[GPL-3.0+] = "GPL-3.0-or-later" > > #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[LGPL-2.0+] = "LGPL-2.0-or-later" > +SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1-only" > +SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only" > +SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only" > +SPDXLICENSEMAP[LGPL-2.1+] = "LGPL-2.1-or-later" > +SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only" > +SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only" > +SPDXLICENSEMAP[LGPL-3.0+] = "LGPL-3.0-or-later" > > #MPL variations > SPDXLICENSEMAP[MPL-1] = "MPL-1.0" //Peter
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148322): https://lists.openembedded.org/g/openembedded-core/message/148322 Mute This Topic: https://lists.openembedded.org/mt/80734233/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
