[dunfell,3/5] licenses: Add GPL+ licenses to map

Message ID	20230322204558.1386634-4-JPEWhacker@gmail.com
State	Accepted, archived
Commit	5f9a8809acf1ab4e73c3085b8fd100f4568ebd86
Headers	show Return-Path: <JPEWhacker@gmail.com> ip: 209.85.210.50, mailfrom: jpewhacker@gmail.com) From: Joshua Watt <jpewhacker@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Joshua Watt <JPEWhacker@gmail.com> Subject: [OE-core][dunfell][PATCH 3/5] licenses: Add GPL+ licenses to map Date: Wed, 22 Mar 2023 15:45:56 -0500 Message-Id: <20230322204558.1386634-4-JPEWhacker@gmail.com> In-Reply-To: <20230322204558.1386634-1-JPEWhacker@gmail.com> References: <20230322204558.1386634-1-JPEWhacker@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Backport SPDX support \| expand [dunfell,0/5] Backport SPDX support [dunfell,1/5] classes/create-spdx: Backport [dunfell,2/5] classes/package: Add extended packaged data [dunfell,3/5] licenses: Add GPL+ licenses to map [dunfell,4/5] create-spdx: Use gzip for compression [dunfell,5/5] classes/package: Use gzip for extended package data

Message ID

20230322204558.1386634-4-JPEWhacker@gmail.com

State

Accepted, archived

Commit

5f9a8809acf1ab4e73c3085b8fd100f4568ebd86

Headers

From: Joshua Watt <jpewhacker@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Joshua Watt <JPEWhacker@gmail.com>
Subject: [OE-core][dunfell][PATCH 3/5] licenses: Add GPL+ licenses to map
Date: Wed, 22 Mar 2023 15:45:56 -0500
Message-Id: <20230322204558.1386634-4-JPEWhacker@gmail.com>
In-Reply-To: <20230322204558.1386634-1-JPEWhacker@gmail.com>
References: <20230322204558.1386634-1-JPEWhacker@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

Backport SPDX support | expand

Commit Message

Joshua Watt March 22, 2023, 8:45 p.m. UTC

Adds some missing licenses mappings related to the "+" versions of the
GPL licenses

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 meta/conf/licenses.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 0149b1dc44..d14c365977 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -22,21 +22,28 @@  SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
 SPDXLICENSEMAP[GPL-1.0-only] = "GPL-1.0"
 SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
 SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
+SPDXLICENSEMAP[GPLv2+] = "GPL-2.0+"
 SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
+SPDXLICENSEMAP[GPLv2.0+] = "GPL-2.0+"
 SPDXLICENSEMAP[GPL-2.0-only] = "GPL-2.0"
 SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
 SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
+SPDXLICENSEMAP[GPLv3+] = "GPL-3.0+"
 SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
+SPDXLICENSEMAP[GPLv3.0+] = "GPL-3.0+"
 SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0"
 
 #LGPL variations
 SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
+SPDXLICENSEMAP[LGPLv2+] = "LGPL-2.0+"
 SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
 SPDXLICENSEMAP[LGPL-2.0-only] = "LGPL-2.0"
 SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
 SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
+SPDXLICENSEMAP[LGPLv2.1+] = "LGPL-2.1+"
 SPDXLICENSEMAP[LGPL-2.1-only] = "LGPL-2.1"
 SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
+SPDXLICENSEMAP[LGPLv3+] = "LGPL-3.0+"
 SPDXLICENSEMAP[LGPL-3.0-only] = "LGPL-3.0"
 
 #MPL variations

[dunfell,3/5] licenses: Add GPL+ licenses to map

Commit Message

Patch