All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Richard Purdie" <richard.purdie@linuxfoundation.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 03/11] licenses.conf: Add missing 'or-later' mappings
Date: Thu, 18 Feb 2021 16:56:38 +0000	[thread overview]
Message-ID: <20210218165646.2109894-3-richard.purdie@linuxfoundation.org> (raw)
In-Reply-To: <20210218165646.2109894-1-richard.purdie@linuxfoundation.org>

If we handle the or-later licences separately (which we should),
we need to add in the missing name mappings for the code to
function correctly.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/licenses.conf | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index a4582b9ae82..5785b0a5b53 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -11,38 +11,55 @@
 
 # AGPL variations
 SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0-only"
+SPDXLICENSEMAP[AGPL-3+] = "AGPL-3.0-or-later"
 SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0-only"
+SPDXLICENSEMAP[AGPLv3+] = "AGPL-3.0-or-later"
 SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0-only"
+SPDXLICENSEMAP[AGPLv3.0+] = "AGPL-3.0-or-later"
 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-only"
+SPDXLICENSEMAP[GPL-1+] = "GPL-1.0-or-later"
 SPDXLICENSEMAP[GPLv1] = "GPL-1.0-only"
+SPDXLICENSEMAP[GPLv1+] = "GPL-1.0-or-later"
 SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0-only"
-SPDXLICENSEMAP[GPL-1.0+] = "GPL-1.0-or-later"
+SPDXLICENSEMAP[GPLv1.0+] = "GPL-1.0-or-later"
 SPDXLICENSEMAP[GPL-1.0] = "GPL-2.0-only"
+SPDXLICENSEMAP[GPL-1.0+] = "GPL-2.0-or-later"
 SPDXLICENSEMAP[GPL-2] = "GPL-2.0-only"
+SPDXLICENSEMAP[GPL-2+] = "GPL-2.0-or-later"
 SPDXLICENSEMAP[GPLv2] = "GPL-2.0-only"
+SPDXLICENSEMAP[GPLv2+] = "GPL-2.0-or-later"
 SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0-only"
+SPDXLICENSEMAP[GPLv2.0+] = "GPL-2.0-or-later"
 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[GPL-3+] = "GPL-3.0-or-later"
 SPDXLICENSEMAP[GPLv3] = "GPL-3.0-only"
+SPDXLICENSEMAP[GPLv3+] = "GPL-3.0-or-later"
 SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0-only"
+SPDXLICENSEMAP[GPLv3.0+] = "GPL-3.0-or-later"
 SPDXLICENSEMAP[GPL-3.0] = "GPL-3.0-only"
 SPDXLICENSEMAP[GPL-3.0+] = "GPL-3.0-or-later"
 
 #LGPL variations
 SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only"
+SPDXLICENSEMAP[LGPLv2+] = "LGPL-2.0-or-later"
 SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only"
+SPDXLICENSEMAP[LGPLv2.0+] = "LGPL-2.0-or-later"
 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[LGPL2.1+] = "LGPL-2.1-or-later"
 SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only"
+SPDXLICENSEMAP[LGPLv2.1+] = "LGPL-2.1-or-later"
 SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only"
 SPDXLICENSEMAP[LGPL-2.1+] = "LGPL-2.1-or-later"
 SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only"
+SPDXLICENSEMAP[LGPLv3+] = "LGPL-3.0-or-later"
 SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only"
 SPDXLICENSEMAP[LGPL-3.0+] = "LGPL-3.0-or-later"
 
-- 
2.27.0


  parent reply	other threads:[~2021-02-18 16:56 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18 16:56 [PATCH 01/11] licenses: Update license file to match current SPDX names Richard Purdie
2021-02-18 16:56 ` [PATCH 02/11] recipes: Update common-licenses references to match new names Richard Purdie
2021-02-18 16:56 ` Richard Purdie [this message]
2021-02-18 19:05   ` [OE-core] [PATCH 03/11] licenses.conf: Add missing 'or-later' mappings Peter Kjellerstedt
2021-02-18 16:56 ` [PATCH 04/11] licenses: Fix canonical license for 'or-later' handling Richard Purdie
2021-02-18 16:56 ` [PATCH 05/11] licenses: Update INCOMPATIBLE_LICENSE " Richard Purdie
2021-02-19 10:13   ` [OE-core] " Quentin Schulz
2021-02-19 10:43     ` Richard Purdie
2021-02-18 16:56 ` [PATCH 06/11] license_image: Don't canonicalise INCOMPATIBLE_LICENSE Richard Purdie
2021-02-18 16:56 ` [PATCH 07/11] license_image: Do canonicalise package license Richard Purdie
2021-02-18 16:56 ` [PATCH 08/11] selftest/incompatible_lic: Update the tests after the 'or-later' license handling changes Richard Purdie
2021-02-18 16:56 ` [PATCH 09/11] xorg-minimal-fonts: Really fix determinism Richard Purdie
2021-02-18 16:56 ` [PATCH 10/11] groff: Fix determinism issue Richard Purdie
2021-02-18 16:56 ` [PATCH 11/11] git: Fix determnism issue Richard Purdie
2021-02-18 19:02 ` [OE-core] [PATCH 01/11] licenses: Update license file to match current SPDX names Peter Kjellerstedt

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=20210218165646.2109894-3-richard.purdie@linuxfoundation.org \
    --to=richard.purdie@linuxfoundation.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.