summaryrefslogtreecommitdiffstats
path: root/meta
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-02-27 15:51:03 +0000
commit9aaf033303adc8ea0d3cabaa01817638e9b17f3c (patch)
tree4c4cdaab1df584d374952baffe7cb6a8e7ab1d8d /meta
parent633519ae977a7e52646c3d9b11aed35877cc3d5c (diff)
downloadpoky-9aaf033303adc8ea0d3cabaa01817638e9b17f3c.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) (From OE-Core rev: 1c121dcf930b0b2e9f5c6e79715864a753a2d34b) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 df3db2cc45..b6d80745cc 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -113,15 +113,15 @@ do_install_append () {
113} 113}
114 114
115do_install_append_aarch64 () { 115do_install_append_aarch64 () {
116 if [ "${base_libdir}" != "/lib" ] ; then 116 if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then
117 # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1 117 # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1
118 install -d ${D}/lib 118 install -d ${D}${nonarch_base_libdir}
119 if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then 119 if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then
120 ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \ 120 ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64.so.1 \
121 ${D}/lib/ld-linux-aarch64.so.1 121 ${D}${nonarch_base_libdir}/ld-linux-aarch64.so.1
122 elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then 122 elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then
123 ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \ 123 ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \
124 ${D}/lib/ld-linux-aarch64_be.so.1 124 ${D}${nonarch_base_libdir}/ld-linux-aarch64_be.so.1
125 fi 125 fi
126 fi 126 fi
127 do_install_armmultilib 127 do_install_armmultilib