[PATCH] external-arm-sdk-toolchain: Fix parsing error with INCOMPATIBLE_LICENSE

[PATCH] external-arm-sdk-toolchain: Fix parsing error with INCOMPATIBLE_LICENSE

[Joshua Watt]

From: Timothy Mertz <timothy.mertz@garmin.com>

This change defines EAD_GDB_LICENSE and EAT_BFD_LICENSE in license.inc
and is required by external-arm-sdk-toolchain.

This change fixes parsing error that occurs when INCOMPATIBLE_LICENSE =
"GPLv3".

Signed-off-by: Timothy Mertz <timothy.mertz@garmin.com>
Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
---
 .../external-arm-toolchain/external-arm-sdk-toolchain.bb        | 2 ++
 .../recipes-devtools/external-arm-toolchain/license.inc         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb
index 3f12b4d..59957ff 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb
@@ -1,5 +1,7 @@
 inherit cross-canadian
 
+require license.inc
+
 PN = "external-arm-sdk-toolchain-${TARGET_ARCH}"
 BPN = "external-arm-sdk-toolchain"
 PV = "${EAT_VER_MAIN}"
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 b6ee42c..6e3d039 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
@@ -1,6 +1,8 @@
 LICENSE = "GPL-3.0-with-GCC-exception & GPLv3 & GPLv2 & LGPLv3 & LGPLv2.1 & LGPLv2"
 
+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"
 
 LICENSE_${PN} = "${EAT_LIBC_LICENSE}"
-- 
2.31.1

Re: [meta-arm] [PATCH] external-arm-sdk-toolchain: Fix parsing error with INCOMPATIBLE_LICENSE

[Sumit Garg]

On Tue, 11 May 2021 at 20:58, Joshua Watt via lists.yoctoproject.org
<Joshua.Watt=garmin.com@lists.yoctoproject.org> wrote:
>
> From: Timothy Mertz <timothy.mertz@garmin.com>
>
> This change defines EAD_GDB_LICENSE and EAT_BFD_LICENSE in license.inc
> and is required by external-arm-sdk-toolchain.
>
> This change fixes parsing error that occurs when INCOMPATIBLE_LICENSE =
> "GPLv3".
>

So the parser isn't able to pick up license variables defined here [1]?

> Signed-off-by: Timothy Mertz <timothy.mertz@garmin.com>
> Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com>
> ---
>  .../external-arm-toolchain/external-arm-sdk-toolchain.bb        | 2 ++
>  .../recipes-devtools/external-arm-toolchain/license.inc         | 2 ++
>  2 files changed, 4 insertions(+)
>
> diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb
> index 3f12b4d..59957ff 100644
> --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb
> +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-sdk-toolchain.bb
> @@ -1,5 +1,7 @@
>  inherit cross-canadian
>
> +require license.inc
> +

If we are using license.inc then we should remove redundant override
for overall license in this recipe:

LICENSE = "${EAT_LICENSE}"

>  PN = "external-arm-sdk-toolchain-${TARGET_ARCH}"
>  BPN = "external-arm-sdk-toolchain"
>  PV = "${EAT_VER_MAIN}"
> 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 b6ee42c..6e3d039 100644
> --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc
> @@ -1,6 +1,8 @@
>  LICENSE = "GPL-3.0-with-GCC-exception & GPLv3 & GPLv2 & LGPLv3 & LGPLv2.1 & LGPLv2"
>
> +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"
>

Now the license variables defined here [1] become redundant, so we can
remove them.

[1] https://git.yoctoproject.org/cgit/cgit.cgi/meta-arm/tree/meta-arm-toolchain/conf/distro/include/external-arm-toolchain-versions.inc#n143

-Sumit

>  LICENSE_${PN} = "${EAT_LIBC_LICENSE}"
> --
> 2.31.1
>
>
> 
>