From 309d93f9e5ad65a5ec1cf502afc766dfe4a5d34b Mon Sep 17 00:00:00 2001 From: Vasyl Vavrychuk Date: Mon, 6 Jan 2025 11:12:36 +0100 Subject: [PATCH] external-arm-toolchain: remove ${base_libdir}/libpthread*.so from FILES:${PN} When `usrmerge` distro feature is not enabled, then `${base_libdir}` resolves to `/lib` and `/lib/libpthread*.so` does not match any files. But, with `usrmerge` distro feature, `${base_libdir}` is `/usr/lib`, so removed line leads to `/usr/lib/libpthread.so` symlink included in `${PN}` which causes QA check failure. (cherry picked from commit 8634bdc2f21e1b2801435ecc7b6f7aacde8a7a00) Signed-off-by: Vasyl Vavrychuk Acked-by: Denys Dmytriyenko Signed-off-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Jon Mason --- .../external-arm-toolchain/external-arm-toolchain.bb | 1 - 1 file changed, 1 deletion(-) 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 cfadf248..4776b7f8 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 @@ -546,7 +546,6 @@ FILES:${PN} += "\ ${base_libdir}/ld*.so.* \ ${base_libdir}/ld-*.so \ ${base_libdir}/libpthread*.so.* \ - ${base_libdir}/libpthread*.so \ ${base_libdir}/libpthread-*.so \ ${base_libdir}/libresolv*.so.* \ ${base_libdir}/libresolv-*.so \