1 files changed, 31 insertions, 17 deletions
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 5b309eb385..089ef37133 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[AGPL-3] = "AGPL-3.0-only"
-SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0"
+SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0-only"
-SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0"
+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[GPL-1] = "GPL-1.0-only"
-SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
+SPDXLICENSEMAP[GPLv1] = "GPL-1.0-only"
-SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
+SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0-only"
-SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
+SPDXLICENSEMAP[GPL-1.0] = "GPL-1.0-only"
-SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
+SPDXLICENSEMAP[GPL-1.0+] = "GPL-1.0-or-later"
-SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
+SPDXLICENSEMAP[GPL-2] = "GPL-2.0-only"
-SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
+SPDXLICENSEMAP[GPLv2] = "GPL-2.0-only"
-SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
+SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0-only"
-SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
+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] = "LGPL-2.0-only"
-SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
+SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only"
-SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
+SPDXLICENSEMAP[LGPL-2.0] = "LGPL-2.0-only"
-SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
+SPDXLICENSEMAP[LGPL-2.0+] = "LGPL-2.0-or-later"
-SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
+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"

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 5b309eb385..089ef37133 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf
@@ -10,27 +10,41 @@
10	# Any mapping to MPL/LGPL/GPL should be fixed	10	# Any mapping to MPL/LGPL/GPL should be fixed
11		11
12	# AGPL variations	12	# AGPL variations
13	SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0"	13	SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0-only"
14	SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0"	14	SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0-only"
15	SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0"	15	SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0-only"
		16	SPDXLICENSEMAP[AGPL-3.0] = "AGPL-3.0-only"
		17	SPDXLICENSEMAP[AGPL-3.0+] = "AGPL-3.0-or-later"
16		18
17	# GPL variations	19	# GPL variations
18	SPDXLICENSEMAP[GPL-1] = "GPL-1.0"	20	SPDXLICENSEMAP[GPL-1] = "GPL-1.0-only"
19	SPDXLICENSEMAP[GPLv1] = "GPL-1.0"	21	SPDXLICENSEMAP[GPLv1] = "GPL-1.0-only"
20	SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"	22	SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0-only"
21	SPDXLICENSEMAP[GPL-2] = "GPL-2.0"	23	SPDXLICENSEMAP[GPL-1.0] = "GPL-1.0-only"
22	SPDXLICENSEMAP[GPLv2] = "GPL-2.0"	24	SPDXLICENSEMAP[GPL-1.0+] = "GPL-1.0-or-later"
23	SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"	25	SPDXLICENSEMAP[GPL-2] = "GPL-2.0-only"
24	SPDXLICENSEMAP[GPL-3] = "GPL-3.0"	26	SPDXLICENSEMAP[GPLv2] = "GPL-2.0-only"
25	SPDXLICENSEMAP[GPLv3] = "GPL-3.0"	27	SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0-only"
26	SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"	28	SPDXLICENSEMAP[GPL-2.0] = "GPL-2.0-only"
		29	SPDXLICENSEMAP[GPL-2.0+] = "GPL-2.0-or-later"
		30	SPDXLICENSEMAP[GPL-3] = "GPL-3.0-only"
		31	SPDXLICENSEMAP[GPLv3] = "GPL-3.0-only"
		32	SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0-only"
		33	SPDXLICENSEMAP[GPL-3.0] = "GPL-3.0-only"
		34	SPDXLICENSEMAP[GPL-3.0+] = "GPL-3.0-or-later"
27		35
28	#LGPL variations	36	#LGPL variations
29	SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"	37	SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only"
30	SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"	38	SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only"
31	SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"	39	SPDXLICENSEMAP[LGPL-2.0] = "LGPL-2.0-only"
32	SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"	40	SPDXLICENSEMAP[LGPL-2.0+] = "LGPL-2.0-or-later"
33	SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"	41	SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1-only"
		42	SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only"
		43	SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only"
		44	SPDXLICENSEMAP[LGPL-2.1+] = "LGPL-2.1-or-later"
		45	SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only"
		46	SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only"
		47	SPDXLICENSEMAP[LGPL-3.0+] = "LGPL-3.0-or-later"
34		48
35	#MPL variations	49	#MPL variations
36	SPDXLICENSEMAP[MPL-1] = "MPL-1.0"	50	SPDXLICENSEMAP[MPL-1] = "MPL-1.0"