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 <[email protected]> --- 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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148312): https://lists.openembedded.org/g/openembedded-core/message/148312 Mute This Topic: https://lists.openembedded.org/mt/80734226/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
