* [PATCH] glibc: Adapt do_install_append_aarch64() for usrmerge
@ 2018-01-27 3:53 Peter Kjellerstedt
2018-01-29 17:33 ` Burton, Ross
0 siblings, 1 reply; 3+ messages in thread
From: Peter Kjellerstedt @ 2018-01-27 3:53 UTC (permalink / raw)
To: openembedded-core
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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
meta/recipes-core/glibc/glibc-package.inc | 12 ++++++------
1 file 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 () {
}
do_install_append_aarch64 () {
- if [ "${base_libdir}" != "/lib" ] ; then
+ 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}/lib
+ install -d ${D}${nonarch_base_libdir}
if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then
- ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \
- ${D}/lib/ld-linux-aarch64.so.1
+ ln -s ${@base_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 ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \
- ${D}/lib/ld-linux-aarch64_be.so.1
+ ln -s ${@base_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
--
2.12.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] glibc: Adapt do_install_append_aarch64() for usrmerge
2018-01-27 3:53 [PATCH] glibc: Adapt do_install_append_aarch64() for usrmerge Peter Kjellerstedt
@ 2018-01-29 17:33 ` Burton, Ross
2018-01-29 18:56 ` Peter Kjellerstedt
0 siblings, 1 reply; 3+ messages in thread
From: Burton, Ross @ 2018-01-29 17:33 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2632 bytes --]
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.
Ross
On 27 January 2018 at 03:53, Peter Kjellerstedt <peter.kjellerstedt@axis.com
> wrote:
> 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.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
> meta/recipes-core/glibc/glibc-package.inc | 12 ++++++------
> 1 file 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 () {
> }
>
> do_install_append_aarch64 () {
> - if [ "${base_libdir}" != "/lib" ] ; then
> + 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}/lib
> + install -d ${D}${nonarch_base_libdir}
> if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then
> - ln -s ${@base_path_relative('/lib',
> '${base_libdir}')}/ld-linux-aarch64.so.1 \
> - ${D}/lib/ld-linux-aarch64.so.1
> + ln -s ${@base_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 ${@base_path_relative('/lib',
> '${base_libdir}')}/ld-linux-aarch64_be.so.1 \
> - ${D}/lib/ld-linux-aarch64_be.so.1
> + ln -s ${@base_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
> --
> 2.12.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 3687 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] glibc: Adapt do_install_append_aarch64() for usrmerge
2018-01-29 17:33 ` Burton, Ross
@ 2018-01-29 18:56 ` Peter Kjellerstedt
0 siblings, 0 replies; 3+ messages in thread
From: Peter Kjellerstedt @ 2018-01-29 18:56 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3355 bytes --]
Apparently this was already merged. However, the assumption is that ${nonarch_base_libdir} will evaluate to /lib, or something that will be accessible as /lib. I.e., the default definition of ${nonarch_base_libdir} is “/lib” unless usrmerge is in DISTRO_FEATURES, in which case it is “${root_prefix/lib” (which evaluates to “/usr/lib”), but then a symbolic link will be created from “/lib” to “/usr/lib”.
//Peter
From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: den 29 januari 2018 18:33
To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH] glibc: Adapt do_install_append_aarch64() for usrmerge
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.
Ross
On 27 January 2018 at 03:53, Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>> wrote:
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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>>
---
meta/recipes-core/glibc/glibc-package.inc | 12 ++++++------
1 file 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 () {
}
do_install_append_aarch64 () {
- if [ "${base_libdir}" != "/lib" ] ; then
+ 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}/lib
+ install -d ${D}${nonarch_base_libdir}
if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then
- ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \
- ${D}/lib/ld-linux-aarch64.so.1
+ ln -s ${@base_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 ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \
- ${D}/lib/ld-linux-aarch64_be.so.1
+ ln -s ${@base_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
--
2.12.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Type: text/html, Size: 8284 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-29 18:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-27 3:53 [PATCH] glibc: Adapt do_install_append_aarch64() for usrmerge Peter Kjellerstedt
2018-01-29 17:33 ` Burton, Ross
2018-01-29 18:56 ` Peter Kjellerstedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.