diff --git a/meta-arm-toolchain/conf/distro/include/external-arm-toolchain-versions.inc b/meta-arm-toolchain/conf/distro/include/external-arm-toolchain-versions.inc index 9d4f9671..a89f2f02 100644 --- a/meta-arm-toolchain/conf/distro/include/external-arm-toolchain-versions.inc +++ b/meta-arm-toolchain/conf/distro/include/external-arm-toolchain-versions.inc @@ -139,19 +139,5 @@ python external_arm_toolchain_version_handler () { d.setVar('EAT_VER_KERNEL', eat_get_kernel_version(ld)) d.setVar('EAT_VER_GDB', eat_get_gdb_version(ld)) d.setVar('EAT_VER_BFD', eat_get_bfd_version(ld)) - - lc_libc = "LGPL-2.1" - lc_gcc = "GPL-3.0" - lc_rle = "GPL-3.0-with-GCC-exception" - lc_gdb = "GPL-3.0" - lc_bfd = "GPL-3.0" - - d.setVar('EAT_LIBC_LICENSE', lc_libc) - d.setVar('EAT_GCC_LICENSE', lc_gcc) - d.setVar('EAT_RLE_LICENSE', lc_rle) - d.setVar('EAT_GDB_LICENSE', lc_gdb) - d.setVar('EAT_BFD_LICENSE', lc_bfd) - - d.setVar('EAT_LICENSE', "%s & %s & %s & %s & %s" % (lc_libc, lc_gcc, lc_rle, lc_gdb, lc_bfd)) } addhandler external_arm_toolchain_version_handler 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 3f12b4de..4f0adce6 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}" @@ -10,9 +12,6 @@ INHIBIT_SYSROOT_STRIP = "1" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_SHLIBS = "1" -EAT_LICENSE ??= "" - -LICENSE = "${EAT_LICENSE}" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" # Skip packaging QA checks for prebuilt binaries 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 b6ee42ce..fcc92681 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/license.inc @@ -1,7 +1,10 @@ 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" +EAT_RLE_LICENSE = "GPL-3.0-with-GCC-exception" LICENSE_${PN} = "${EAT_LIBC_LICENSE}" LICENSE_${PN}-dev = "${EAT_LIBC_LICENSE}"