All of lore.kernel.org
 help / color / mirror / Atom feed
From: ja.kaisrlik@gmail.com
To: poky@lists.yoctoproject.org
Cc: raj.khem@gmail.com, armccurdy@gmail.com,
	Jan Kaisrlik <ja.kaisrlik@gmail.com>
Subject: [meta-poky][PATCH] musl: removes aliases for glibc provided libraries
Date: Wed, 11 Mar 2020 11:44:23 +0100	[thread overview]
Message-ID: <20200311104423.556794-1-ja.kaisrlik@gmail.com> (raw)

From: Jan Kaisrlik <ja.kaisrlik@gmail.com>

Based on the recommendation in musl mailing list[1] All symlinks have
been removed from musl recipe.

[1]: https://www.openwall.com/lists/musl/2020/03/10/11

Signed-off-by: Jan Kaisrlik <ja.kaisrlik@gmail.com>

---

To move discusion from musl mainling list futher I wrote this patch. I'm affraid
that the patch can break existing builds. OTOH I've tested with my non-trivial
distro and I find sdk/image working without any additional patches.

 meta/recipes-core/musl/musl_git.bb | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index afc8446547..f4fbb03092 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -66,24 +66,11 @@ do_install() {
 	rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
 	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
-		ln -sf libc.so ${D}${libdir}/lib$l.so
-	done
-	for i in libc.so.6 libcrypt.so.1 libdl.so.2 libm.so.6 libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1; do
-		ln -sf libc.so ${D}${libdir}/$i
-	done
 }
 
 PACKAGES =+ "${PN}-glibc-compat"
 
-FILES_${PN}-glibc-compat += "\
-                ${libdir}/libc.so.6 ${libdir}/libcrypt.so.1 \
-                ${libdir}/libdl.so.2 ${libdir}/libm.so.6 \
-                ${libdir}/libpthread.so.0 ${libdir}/libresolv.so.2 \
-                ${libdir}/librt.so.1 ${libdir}/libutil.so.1 \
-                ${GLIBC_LDSO} \
-                "
+FILES_${PN}-glibc-compat += "${GLIBC_LDSO}"
 
 RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev"
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
-- 
2.25.0


             reply	other threads:[~2020-03-11 10:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-11 10:44 ja.kaisrlik [this message]
2020-03-11 14:23 ` [meta-poky][PATCH] musl: removes aliases for glibc provided libraries Khem Raj

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=20200311104423.556794-1-ja.kaisrlik@gmail.com \
    --to=ja.kaisrlik@gmail.com \
    --cc=armccurdy@gmail.com \
    --cc=poky@lists.yoctoproject.org \
    --cc=raj.khem@gmail.com \
    /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.