From efd07731659f2e8e8970f1a26e8dacfbd19ce832 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 30 Apr 2020 00:10:26 -0400 Subject: [PATCH] external-arm-toolchain: drop unnecessary binutils-cross-${TARGET_ARCH} in PROVIDES There's no need to directly provide binutils-cross-${TARGET_ARCH}, as the PROVIDES list already contains virtual/${TARGET_PREFIX}binutils and correct PREFERRED_PROVIDER is set in the corresponding tcmode-external-arm.inc file: PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-arm-toolchain" Similar to the compiler: PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-arm-toolchain" And similar to glibc: PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-arm-toolchain" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-arm-toolchain" There shouldn't be any direct dependency on binutils-cross-${TARGET_ARCH}. And if there is, it needs to be fixed to depend on virtual/${TARGET_PREFIX}binutils During 8.x upgrade there was an attempt to clean it up: https://git.linaro.org/openembedded/meta-linaro.git/commit/meta-linaro-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb?id=a8ce3dc47f3be9f98abc6ac98a849f918386cf9f But unfortunately, it got re-added back w/o reasoning: https://git.linaro.org/openembedded/meta-linaro.git/commit/?id=bb04bc8c67fd032fe04c47b2163ea5fa6b2ffa86 Also, while at it, fix indentation for glibc-mtrace in PROVIDES list. Signed-off-by: Denys Dmytriyenko Reviewed-by: Sumit Garg Reviewed-by: Diego Sueiro Signed-off-by: Jon Mason --- .../external-arm-toolchain/external-arm-toolchain.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb index ddd3aff9..33d6c35b 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb @@ -15,14 +15,13 @@ PROVIDES += "\ virtual/${TARGET_PREFIX}g++ \ virtual/${TARGET_PREFIX}gcc-initial \ virtual/${TARGET_PREFIX}binutils \ - binutils-cross-${TARGET_ARCH} \ virtual/${TARGET_PREFIX}libc-for-gcc \ virtual/${TARGET_PREFIX}compilerlibs \ virtual/libc \ virtual/libintl \ virtual/libiconv \ virtual/crypt \ - glibc-mtrace \ + glibc-mtrace \ glibc-thread-db \ glibc \ libc-mtrace \