Re: [OE-core] [poky][PATCH v3] Update license file to match current SPDX names

Richard Purdie
2020-10-10T12:40:23Z

On Sat, 2020-10-10 at 13:23 +0100, Meh Mbeh Ida Delphine wrote:
> Updated mappings of license fields of meta/conf/licenses.conf to
> match latest SPDX naming.
> Added missing mappings.
>
> Fixes: [YOCTO #13320]
>
> Signed-off-by: Meh Mbeh Ida Delphine <idadelm@gmail.com>
> ---
>
> Changes in V3:
> * Added missing mappings to meta/conf/licenses.conf
>
> Changes in V2:
> * Corrected the email subject line.
>
> meta/conf/licenses.conf | 55 ++++++++++++++++++++++++++++-----------
> --
> 1 file changed, 38 insertions(+), 17 deletions(-)
>
> diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
> index 5b309eb385..b45a9d283e 100644
> --- a/meta/conf/licenses.conf
> +++ b/meta/conf/licenses.conf
> @@ -10,33 +10,44 @@
> # Any mapping to MPL/LGPL/GPL should be fixed
>
> # AGPL variations
> -SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0"
> -SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0"
> -SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0"
> +SPDXLICENSEMAP[AGPL-3] = "AGPL-3.0-only"
> +SPDXLICENSEMAP[AGPLv3] = "AGPL-3.0-only"
> +SPDXLICENSEMAP[AGPLv3.0] = "AGPL-3.0-only"
> +SPDXLICENSEMAP[AGPL-3.0] = "AGPL-3.0-only"
>
> # GPL variations
> -SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
> -SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
> -SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
> -SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
> -SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
> -SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
> -SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
> -SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
> -SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
> +SPDXLICENSEMAP[GPL-1] = "GPL-1.0-only"
> +SPDXLICENSEMAP[GPLv1] = "GPL-1.0-only"
> +SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0-only"
> +SPDXLICENSEMAP[GPL-1.0] = "GPL-2.0-only"
> +SPDXLICENSEMAP[GPL-2] = "GPL-2.0-only"
> +SPDXLICENSEMAP[GPLv2] = "GPL-2.0-only"
> +SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0-only"
> +SPDXLICENSEMAP[GPL-2.0] = "GPL-2.0-only"
> +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"
>
> #LGPL variations
> -SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
> -SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
> -SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
> -SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
> -SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
> +SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0-only"
> +SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0-only"
> +SPDXLICENSEMAP[LGPL-2.0] = "LGPL-2.0-only"
> +SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1-only"
> +SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1-only"
> +SPDXLICENSEMAP[LGPL-2.1] = "LGPL-2.1-only"
> +SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0-only"
> +SPDXLICENSEMAP[LGPL-3.0] = "LGPL-3.0-only"

The above is all good, thanks.

> #MPL variations
> SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
> SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
> +SPDXLICENSEMAP[MPL-1.0] = "MPL-1.0"
> SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
> +SPDXLICENSEMAP[MPL-1.1] = "MPL-1.1"
> SPDXLICENSEMAP[MPLv2] = "MPL-2.0"
> +SPDXLICENSEMAP[MPL-2.0] = "MPL-2.0"
> +

However we don't need to add ones where the two values are the same.

Cheers,

Richard