external-arm-toolchain: convert remaining licenses to SPDX

Message ID 20220224172442.2136276-1-denis@denix.org
State New
Headers show
Series external-arm-toolchain: convert remaining licenses to SPDX | expand

Commit Message

Denys Dmytriyenko Feb. 24, 2022, 5:24 p.m. UTC
As automated script missed those.
Also, correct GPLv3 to actually be GPL-3.0-only for toolchain components.

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
---
 .../recipes-devtools/external-arm-toolchain/license.inc   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Sumit Garg Feb. 25, 2022, 5:21 a.m. UTC | #1
Hi Denys,

On Thu, 24 Feb 2022 at 22:54, Denys Dmytriyenko <denis@denix.org> wrote:
>
> As automated script missed those.
> Also, correct GPLv3 to actually be GPL-3.0-only for toolchain components.
>
> Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> ---
>  .../recipes-devtools/external-arm-toolchain/license.inc   | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>

It looks like there is already a patch merged to fix this.

[1] https://git.yoctoproject.org/meta-arm/commit/?id=74bd32b2e619b0308b6e44841c6bb2c5968346ee

-Sumit

> diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> index 10f2542..4260dc7 100644
> --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> @@ -1,9 +1,9 @@
>  LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only & GPL-2.0-only & LGPL-3.0-only & LGPL-2.1-only & LGPL-2.0-only"
>
> -EAT_BFD_LICENSE = "GPL-3.0"
> -EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
> -EAT_GDB_LICENSE = "GPL-3.0"
> -EAT_LIBC_LICENSE = "GPLv2 & LGPLv2.1"
> +EAT_BFD_LICENSE = "GPL-3.0-only"
> +EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
> +EAT_GDB_LICENSE = "GPL-3.0-only"
> +EAT_LIBC_LICENSE = "GPL-2.0-only & LGPL-2.1-only"
>  EAT_RLE_LICENSE = "GPL-3.0-with-GCC-exception"
>
>  LICENSE:${PN} = "${EAT_LIBC_LICENSE}"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#3057): https://lists.yoctoproject.org/g/meta-arm/message/3057
> Mute This Topic: https://lists.yoctoproject.org/mt/89370103/1777089
> Group Owner: meta-arm+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [sumit.garg@linaro.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Denys Dmytriyenko Feb. 25, 2022, 9:20 p.m. UTC | #2
On Fri, Feb 25, 2022 at 10:51:13AM +0530, Sumit Garg wrote:
> Hi Denys,
> 
> On Thu, 24 Feb 2022 at 22:54, Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > As automated script missed those.
> > Also, correct GPLv3 to actually be GPL-3.0-only for toolchain components.
> >
> > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > ---
> >  .../recipes-devtools/external-arm-toolchain/license.inc   | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> 
> It looks like there is already a patch merged to fix this.
> 
> [1] https://git.yoctoproject.org/meta-arm/commit/?id=74bd32b2e619b0308b6e44841c6bb2c5968346ee

It was not in the master at the time and there were no patch on the mailing 
list.


> -Sumit
> 
> > diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> > index 10f2542..4260dc7 100644
> > --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> > +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> > @@ -1,9 +1,9 @@
> >  LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only & GPL-2.0-only & LGPL-3.0-only & LGPL-2.1-only & LGPL-2.0-only"
> >
> > -EAT_BFD_LICENSE = "GPL-3.0"
> > -EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
> > -EAT_GDB_LICENSE = "GPL-3.0"
> > -EAT_LIBC_LICENSE = "GPLv2 & LGPLv2.1"
> > +EAT_BFD_LICENSE = "GPL-3.0-only"
> > +EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
> > +EAT_GDB_LICENSE = "GPL-3.0-only"
> > +EAT_LIBC_LICENSE = "GPL-2.0-only & LGPL-2.1-only"
> >  EAT_RLE_LICENSE = "GPL-3.0-with-GCC-exception"
> >
> >  LICENSE:${PN} = "${EAT_LIBC_LICENSE}"
> > --
> > 2.25.1
Jon Mason Feb. 28, 2022, 2:32 p.m. UTC | #3
On Fri, Feb 25, 2022 at 04:20:33PM -0500, Denys Dmytriyenko wrote:
> On Fri, Feb 25, 2022 at 10:51:13AM +0530, Sumit Garg wrote:
> > Hi Denys,
> > 
> > On Thu, 24 Feb 2022 at 22:54, Denys Dmytriyenko <denis@denix.org> wrote:
> > >
> > > As automated script missed those.
> > > Also, correct GPLv3 to actually be GPL-3.0-only for toolchain components.
> > >
> > > Signed-off-by: Denys Dmytriyenko <denis@denix.org>
> > > ---
> > >  .../recipes-devtools/external-arm-toolchain/license.inc   | 8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > 
> > It looks like there is already a patch merged to fix this.
> > 
> > [1] https://git.yoctoproject.org/meta-arm/commit/?id=74bd32b2e619b0308b6e44841c6bb2c5968346ee
> 
> It was not in the master at the time and there were no patch on the mailing 
> list.

Sorry, the build was broken and we were a little (over) eager to get
it working. 

> 
> 
> > -Sumit
> > 
> > > diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> > > index 10f2542..4260dc7 100644
> > > --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> > > +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> > > @@ -1,9 +1,9 @@
> > >  LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only & GPL-2.0-only & LGPL-3.0-only & LGPL-2.1-only & LGPL-2.0-only"
> > >
> > > -EAT_BFD_LICENSE = "GPL-3.0"
> > > -EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
> > > -EAT_GDB_LICENSE = "GPL-3.0"
> > > -EAT_LIBC_LICENSE = "GPLv2 & LGPLv2.1"
> > > +EAT_BFD_LICENSE = "GPL-3.0-only"
> > > +EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
> > > +EAT_GDB_LICENSE = "GPL-3.0-only"
> > > +EAT_LIBC_LICENSE = "GPL-2.0-only & LGPL-2.1-only"
> > >  EAT_RLE_LICENSE = "GPL-3.0-with-GCC-exception"
> > >
> > >  LICENSE:${PN} = "${EAT_LIBC_LICENSE}"
> > > --
> > > 2.25.1
>

Patch

diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
index 10f2542..4260dc7 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
@@ -1,9 +1,9 @@ 
 LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only & GPL-2.0-only & LGPL-3.0-only & LGPL-2.1-only & LGPL-2.0-only"
 
-EAT_BFD_LICENSE = "GPL-3.0"
-EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
-EAT_GDB_LICENSE = "GPL-3.0"
-EAT_LIBC_LICENSE = "GPLv2 & LGPLv2.1"
+EAT_BFD_LICENSE = "GPL-3.0-only"
+EAT_GCC_LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
+EAT_GDB_LICENSE = "GPL-3.0-only"
+EAT_LIBC_LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 EAT_RLE_LICENSE = "GPL-3.0-with-GCC-exception"
 
 LICENSE:${PN} = "${EAT_LIBC_LICENSE}"