diff options
author | Meh Mbeh Ida Delphine <idadelm@gmail.com> | 2020-10-15 21:45:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-21 22:01:28 +0000 |
commit | 2456f523cfbbae0e509797a0aefa9733f2cb13e3 (patch) | |
tree | 16560759e11913adde8a5e10c2bcd691cd843c05 /meta/conf | |
parent | a425e01da82aba276344c8fa6ec7c9c81854832b (diff) | |
download | poky-2456f523cfbbae0e509797a0aefa9733f2cb13e3.tar.gz |
licenses: Update license file to match current SPDX names
* Updated mappings of license fields of meta/conf/licenses.conf to match
latest SPDX naming.
* Add mappings to the old names
* Renamed license files to match the new preferred names.
* Added "or later" versions of license mappings
* Added "or later" versions of common license files eg GPL-2.0-or-later
Fixes: [YOCTO #13320]
(From OE-Core rev: 5ecf139a31fa7bd813855f1235ea9f434fbcb2e0)
Signed-off-by: Meh Mbeh Ida Delphine <idadelm@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/licenses.conf | 48 |
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 @@ | |||
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" |