<div dir="ltr">How does the patch relate to the comment which states the ABI says the path *must* be /lib/. Is that wrong? How does this interact with the merged symlink creation in image.bbclass? Please expand on the message so it's clear what is meant to be happening.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 27 January 2018 at 03:53, Peter Kjellerstedt <span dir="ltr"><<a href="mailto:peter.kjellerstedt@axis.com" target="_blank">peter.kjellerstedt@axis.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Change hardcoded /lib to ${nonarch_base_libdir} to correctly adapt the<br>
code in do_install_append_aarch64() for when usrmerge is enabled in<br>
DISTRO_FEATURES.<br>
<br>
Signed-off-by: Peter Kjellerstedt <<a href="mailto:peter.kjellerstedt@axis.com">peter.kjellerstedt@axis.com</a>><br>
---<br>
meta/recipes-core/glibc/glibc-<wbr>package.inc | 12 ++++++------<br>
1 file changed, 6 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/meta/recipes-core/glibc/<wbr>glibc-package.inc b/meta/recipes-core/glibc/<wbr>glibc-package.inc<br>
index 817d850358..4d3dc679b4 100644<br>
--- a/meta/recipes-core/glibc/<wbr>glibc-package.inc<br>
+++ b/meta/recipes-core/glibc/<wbr>glibc-package.inc<br>
@@ -114,15 +114,15 @@ do_install_append () {<br>
}<br>
<br>
do_install_append_aarch64 () {<br>
- if [ "${base_libdir}" != "/lib" ] ; then<br>
+ if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then<br>
# The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.<wbr>1<br>
- install -d ${D}/lib<br>
+ install -d ${D}${nonarch_base_libdir}<br>
if [ -e ${D}${base_libdir}/ld-linux-<wbr>aarch64.so.1 ]; then<br>
- ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-<wbr>aarch64.so.1 \<br>
- ${D}/lib/ld-linux-aarch64.so.1<br>
+ ln -s ${@base_path_relative('${<wbr>nonarch_base_libdir}', '${base_libdir}')}/ld-linux-<wbr>aarch64.so.1 \<br>
+ ${D}${nonarch_base_libdir}/ld-<wbr>linux-aarch64.so.1<br>
elif [ -e ${D}${base_libdir}/ld-linux-<wbr>aarch64_be.so.1 ]; then<br>
- ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-<wbr>aarch64_be.so.1 \<br>
- ${D}/lib/ld-linux-aarch64_be.<wbr>so.1<br>
+ ln -s ${@base_path_relative('${<wbr>nonarch_base_libdir}', '${base_libdir}')}/ld-linux-<wbr>aarch64_be.so.1 \<br>
+ ${D}${nonarch_base_libdir}/ld-<wbr>linux-aarch64_be.so.1<br>
fi<br>
fi<br>
do_install_armmultilib<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.12.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>