glibc: Separate out AArch64 multilib loader symlink creation
PATCH 1/1 glibc: Separate out AArch64 multilib loader symlink creation
Until now, glibc was responsible for creating an AArch64 dynamic loader symlink if required for ABI compatibility.
Unfortunately, using multilib with AArch64 caused the rmdir in glibc-package.inc:do_poststash_install_cleanup to fail because that task did not expect to find the dynamic loader symlink in /lib.
Also, although glibc-package.inc:do_install_append_aarch64 made use of ${nonarch_base_libdir} to create the dynamic loader symlink in a way that was compatible with usrmerge, it unfortunately explicitly added only /lib to libc_baselibs, so the symlink was not packaged correctly when using usrmerge.
Attempting to fix both of these problems within glibc-package.inc in various ways created a bit of a mess. It seemed much simpler to invent a new package for the symlink and have glibc RDEPEND on that package if required.
Richard Purdie suggested[1] that ${nonarch_base_libdir} should not be used in this way. I've switched to using ${root_prefix}/lib which continues to work both with and without usrmerge.
Unfortunately, it appears not to be possible to specify the name of the loader via a variable with an override, since the _aarch64 override is applied even for _aarch64-be.
Build-tested and inspected core-image-minimal rootfs with:
* AArch64 no multilib (real loader in correct place) MACHINE = "qemuarm64"
* AArch64 multilib (symlink in correct place) MACHINE = "qemuarm64"
MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon" require conf/multilib.conf
* AArch64 usrmerge (real loader in correct place)
DISTRO_FEATURES += "usrmerge"
MACHINE = "qemuarm64"
* AArch64 multilib usrmerge (symlink in correct place) DISTRO_FEATURES += "usrmerge"
MACHINE = "qemuarm64"
MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon" require conf/multilib.conf
* AArch64 big-endian multilib usrmerge (symlink in correct place) DEFAULTTUNE = "aarch64_be"
DISTRO_FEATURES += "usrmerge"
MACHINE = "qemuarm64"
MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon" require conf/multilib.conf
* x86 (real loader in correct place)
MACHINE = "qemux86"
[1] http://lists.openembedded.org/pipermail/openembedded-core/2018-November/276120.html
--- .../glibc/glibc-loader-symlink.bb | 26 +++++++++++++++++++ meta/recipes-core/glibc/glibc-package.inc | 20 +++++--------- 2 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 meta/recipes-core/glibc/glibc-loader-symlink.bb
meta/recipes-core/glibc/glibc-loader-symlink.bb new file +26 -0
@@ -0,0 +1,26 @@ +# On AArch64, at least glibc will RDEPEND on this recipe in order to +# ensure that the dynamic loader is available in the ABI-mandated +# location when that location differs from where glibc installed it. +# This happens when multilib is enabled. + +SUMMARY = "AArch64 compatibility symlink when using multilib" +LICENSE = "MIT" + +INSANE_SKIP_${PN}_append_aarch64 = " libdir" +FILES_${PN} = "${root_prefix}/lib" + +do_install_aarch64() { + if [ "${base_libdir}" != "${root_prefix}/lib" ]; then + # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 + install -d ${D}${root_prefix}/lib + if [ "${ARMPKGARCH}" = "aarch64" ]; then + ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \ + ${D}${root_prefix}/lib/ld-linux-aarch64.so.1 + elif [ "${ARMPKGARCH}" = "aarch64_be" ]; then + ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ + ${D}${root_prefix}/lib/ld-linux-aarch64_be.so.1 + else + false + fi + fi +}
meta/recipes-core/glibc/glibc-package.inc +7 -13
@@ -15,8 +15,6 @@ RPROVIDES_glibc-thread-db = "eglibc-thread-db" RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" RPROVIDES_${PN}-dbg = "eglibc-dbg" libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" -libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" -INSANE_SKIP_${PN}_append_aarch64 = " libdir" FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" FILES_ldd = "${bindir}/ldd"
@@ -44,6 +42,13 @@ FILES_glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthre RPROVIDES_${PN}-dev += "libc-dev" RPROVIDES_${PN}-staticdev += "libc-staticdev" +# For AArch64 at least, we need to ensure that the dynamic loader is +# available by the ABI-mandated path in /lib. This will always be true +# if ${base_libdir} is /lib (or perhaps /usr/lib when usrmerge is +# enabled), but we need to depend on glibc-loader-symlink to provide +# it otherwise. +RDEPENDS_${PN}_aarch64 = "${@oe.utils.conditional('base_libdir', '${root_prefix}/lib', '', 'glibc-loader-symlink', d)}" + SUMMARY_sln = "The static ln" DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional." SUMMARY_nscd = "Name service cache daemon"
@@ -115,17 +120,6 @@ do_install_append () { } do_install_append_aarch64 () { - if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then - # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 - install -d ${D}${nonarch_base_libdir} - if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then - ln -s ${@oe.path.relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64.so.1 \ - ${D}${nonarch_base_libdir}/ld-linux-aarch64.so.1 - elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then - ln -s ${@oe.path.relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ - ${D}${nonarch_base_libdir}/ld-linux-aarch64_be.so.1 - fi - fi do_install_armmultilib }
Signature · 1 line
2.20.1
✗ patchtest: failure for glibc: Separate out AArch64 multilib loader symlink creation
== Series Details ==
Series: glibc: Separate out AArch64 multilib loader symlink creation
Revision: 1
URL : https://patchwork.openembedded.org/series/15595/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Patch glibc: Separate out AArch64 multilib loader symlink creation Issue Patch is missing Signed-off-by [test_signed_off_by_presence] Suggested fix Sign off the patch (either manually or with "git commit --amend -s")
* Issue LIC_FILES_CHKSUM is missing in newly added recipe [test_lic_files_chksum_presence]
Suggested fix Specify the variable LIC_FILES_CHKSUM in glibc-loader-symlink
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe