summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-01-27 04:53:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-29 08:49:50 +0000
commit942987f9cb15a92ac13118e2c2f13bcafe5e327e (patch)
tree3f13d8ba982417a24532794f4cf0467a4f546e7b
parent06cf2a85c60df073be07b54e565428cae47a6065 (diff)
downloadpoky-942987f9cb15a92ac13118e2c2f13bcafe5e327e.tar.gz
glibc: Adapt do_install_append_aarch64() for usrmerge
Change hardcoded /lib to ${nonarch_base_libdir} to correctly adapt the code in do_install_append_aarch64() for when usrmerge is enabled in DISTRO_FEATURES. (From OE-Core rev: ac373c9f760463d989d6a1eb3a14b7c5b255b9d4) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 817d850358..4d3dc679b4 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -114,15 +114,15 @@ do_install_append () {
114} 114}
115 115
116do_install_append_aarch64 () { 116do_install_append_aarch64 () {
117 if [ "${base_libdir}" != "/lib" ] ; then 117 if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then
118 # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 118 # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1
119 install -d ${D}/lib 119 install -d ${D}${nonarch_base_libdir}
120 if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then 120 if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then
121 ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \ 121 ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64.so.1 \
122 ${D}/lib/ld-linux-aarch64.so.1 122 ${D}${nonarch_base_libdir}/ld-linux-aarch64.so.1
123 elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then 123 elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then
124 ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ 124 ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \
125 ${D}/lib/ld-linux-aarch64_be.so.1 125 ${D}${nonarch_base_libdir}/ld-linux-aarch64_be.so.1
126 fi 126 fi
127 fi 127 fi
128 do_install_armmultilib 128 do_install_armmultilib