From: Serhey Popovych <serhe.popovych@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/2] musl: Fix ldd symlink install in case of multilib
Date: Tue, 18 Dec 2018 00:29:52 +0200 [thread overview]
Message-ID: <1545085793-30072-2-git-send-email-serhe.popovych@gmail.com> (raw)
In-Reply-To: <1545085793-30072-1-git-send-email-serhe.popovych@gmail.com>
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@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
next prev parent reply other threads:[~2018-12-17 22:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 22:29 [PATCH 0/2] multilib: Fix and improve support in musl and glibc Serhey Popovych
2018-12-17 22:29 ` Serhey Popovych [this message]
2018-12-17 22:29 ` [PATCH 2/2] glibc: Rename ldd in multilib package Serhey Popovych
2019-01-12 10:19 ` [PATCH 0/2] multilib: Fix and improve support in musl and glibc Serhey Popovych
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1545085793-30072-2-git-send-email-serhe.popovych@gmail.com \
--to=serhe.popovych@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.