From c10a9a2d3b8477e617245e0ead5459313caa794d Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 5 May 2020 22:15:32 -0400 Subject: [PATCH] gcc-arm: remove extra binary aliases when TCMODE=external-arm When TCMODE=external-arm, TARGET_SYS!=EAT_TARGET_SYS and gcc installs extra binary aliases, which could lead to QA errors: ERROR: gcc-arm-9.2-r2019.12 do_package: QA Issue: gcc: Files/directories were installed but not shipped in any package: /usr/bin/arm-poky-linux-gnueabi-arm-none-linux-gnueabihf-g++ /usr/bin/arm-poky-linux-gnueabi-arm-none-linux-gnueabihf-gcc /usr/bin/arm-poky-linux-gnueabi-arm-none-linux-gnueabihf-gcc-ar /usr/bin/arm-poky-linux-gnueabi-arm-none-linux-gnueabihf-gcc-ranlib /usr/bin/arm-poky-linux-gnueabi-arm-none-linux-gnueabihf-gcc-nm Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. gcc: 5 installed and not shipped files. [installed-vs-shipped] ERROR: gcc-arm-9.2-r2019.12 do_package: Fatal QA errors found, failing task. Signed-off-by: Denys Dmytriyenko Signed-off-by: Jon Mason --- .../recipes-devtools/gcc/gcc-arm-common.inc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-arm-toolchain/recipes-devtools/gcc/gcc-arm-common.inc b/meta-arm-toolchain/recipes-devtools/gcc/gcc-arm-common.inc index 55f40e12..55997439 100644 --- a/meta-arm-toolchain/recipes-devtools/gcc/gcc-arm-common.inc +++ b/meta-arm-toolchain/recipes-devtools/gcc/gcc-arm-common.inc @@ -15,3 +15,13 @@ do_install_prepend_class-target () { install ${STAGING_LIBDIR}/gcc/${EAT_TARGET_SYS}/${EAT_VER_GCC}/include/unwind.h ${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/gcc/${TARGET_SYS}/${BINV}/include/ fi } + +# When TCMODE="external-arm" and TARGET_SYS is different from EAT_TARGET_SYS, +# gcc installs additional aliases as ${TARGET_SYS}-${EAT_TARGET_SYS}-gcc, etc. +# Since those are not packaged and not too useful, let's remove them to avoid +# QA issues +do_install_append () { + for f in g++ gcc gcc-ar gcc-ranlib gcc-nm; do + rm -f ${D}${bindir}/${TARGET_SYS}-${EAT_TARGET_SYS}-$f + done +}