[OE-core] [OE-Core][PATCH 1/2] musl: Fix ldd symlink install in case of multilib
Serhey Popovych
serhe.popovych at gmail.com
Mon Dec 17 22:29:52 UTC 2018
Otherwise dnf install lib32-musl and musl will fail with below error:
ERROR: core-image-sato-1.0-r0 do_rootfs: Could not invoke dnf.
...
Error: Transaction check error:
file /usr/bin/ldd.musl conflicts between attempted installs of \
musl-1.1.20+git0+39ef612aa1-r0.ppc64p8 and \
lib32-musl-1.1.20+git0+39ef612aa1-r0.ppcp8
...
Signed-off-by: Serhey Popovych <serhe.popovych at gmail.com>
---
meta/recipes-core/musl/musl_git.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 9cc875c..80dd9f2 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -61,8 +61,9 @@ do_install() {
oe_runmake install DESTDIR='${D}'
install -d ${D}${bindir}
- rm -f ${D}${bindir}/ldd
- lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
+ [ -n "${MLPREFIX}" ] && LDD="ldd.${PN}" || LDD="ldd"
+ rm -f ${D}${bindir}/${LDD}
+ lnr ${D}${libdir}/libc.so ${D}${bindir}/${LDD}
lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO}
for l in crypt dl m pthread resolv rt util xnet
do
--
2.7.4
More information about the Openembedded-core
mailing list