| Message ID | 20240417113042.91880-4-vvavrychuk@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | external-arm-toolchain: fix build when usrmege enabled | expand |
On Wed, Apr 17, 2024 at 02:30:42PM +0300, Vasyl Vavrychuk wrote: > 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. > > Signed-off-by: Vasyl Vavrychuk <vvavrychuk@gmail.com> Acked-by: Denys Dmytriyenko <denys@konsulko.com> > --- > .../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 ab608128..f0955b29 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 > @@ -528,7 +528,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 \ > -- > 2.40.0
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 ab608128..f0955b29 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 @@ -528,7 +528,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 \
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. Signed-off-by: Vasyl Vavrychuk <vvavrychuk@gmail.com> --- .../external-arm-toolchain/external-arm-toolchain.bb | 1 - 1 file changed, 1 deletion(-)