From 1e599c15d8cbf16657bb932534386c8a664d00e0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Feb 2021 15:03:33 +0000 Subject: licenses.conf: Add missing 'or-later' mappings 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. (From OE-Core rev: ccc785f9d428b279c8aa9a1ca00dc685342fdb1e) Signed-off-by: Richard Purdie --- meta/conf/licenses.conf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'meta/conf') diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 089ef37133..1fe5fc6ec1 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[GPLv1.0+] = "GPL-1.0-or-later" SPDXLICENSEMAP[GPL-1.0] = "GPL-1.0-only" SPDXLICENSEMAP[GPL-1.0+] = "GPL-1.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" -- cgit v1.2.3-54-g00ecf