Skip to contentSkip to conversation

musl: Add aliases for glibc provided libraries

PATCH Superseded Khem Raj 3 participants 4 messages Sep 16, 2018 – Sep 17, 2018

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 musl: Add aliases for glibc provided libraries

This is a step towards running pebuilt applications for glibc on musl There are many realworld applications which are not always built from source, especially provided by third party

---
 meta/recipes-core/musl/musl_git.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
meta/recipes-core/musl/musl_git.bb +12 -0
index be31718e3a..a830c36eeb 100644
@@ -26,6 +26,14 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
            bsd-headers \
            libssp-nonshared \
           "
+GLIBC_LDSO ?= "ld.so.1"
+GLIBC_LDSO_arm = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ld-linux-armhf.so.3', 'ld-linux.so.3', d)}"
+GLIBC_LDSO_aarch64 = "ld-linux-aarch64.so.1"
+GLIBC_LDSO_x86 = "ld-linux.so.2"
+GLIBC_LDSO_x86_64 = "ld-linux-x86-64.so.2"
+GLIBC_LDSO_x32 = "ld-linux-x32.so.2"
+GLIBC_LDSO_powerpc64 = "ld64.so.1"
+GLIBC_LDSO_mips64 = "ld64.so.1"
 
 export CROSS_COMPILE="${TARGET_PREFIX}"
 
@@ -62,10 +70,14 @@ do_install() {
 	install -d ${D}${bindir}
 	rm -f ${D}${bindir}/ldd
 	lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
+	lnr ${D}${libdir}/libc.so ${D}${base_libdir}/${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
 }
 
 RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev"
Signature · 1 line
2.19.0
#1 lore raw

✗ patchtest: failure for musl: Add aliases for glibc provided libraries

== Series Details ==

Series: musl: Add aliases for glibc provided libraries
Revision: 1
URL : https://patchwork.openembedded.org/series/14093/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Patch            musl: Add aliases for glibc provided libraries
 Issue             Patch is missing Signed-off-by [test_signed_off_by_presence] 
  Suggested fix    Sign off the patch (either manually or with "git commit --amend -s")

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#2 lore raw
In reply to Khem Raj
Quoted 3 lines · Khem Raj

This is a step towards running pebuilt applications for glibc on musl There are many realworld applications which are not always built from source, especially provided by third party

Should these symlinks go in a separate package (musl-glibc-compat ?) so that only people trying to run closed source glibc binaries on musl need to see them?

Quoted 47 lines
---
 meta/recipes-core/musl/musl_git.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
meta/recipes-core/musl/musl_git.bb +12 -1
index be31718e3a..a830c36eeb 100644
@@ -26,6 +26,14 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
            bsd-headers \
            libssp-nonshared \
           "
+GLIBC_LDSO ?= "ld.so.1"
+GLIBC_LDSO_arm = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ld-linux-armhf.so.3', 'ld-linux.so.3', d)}"
+GLIBC_LDSO_aarch64 = "ld-linux-aarch64.so.1"
+GLIBC_LDSO_x86 = "ld-linux.so.2"
+GLIBC_LDSO_x86_64 = "ld-linux-x86-64.so.2"
+GLIBC_LDSO_x32 = "ld-linux-x32.so.2"
+GLIBC_LDSO_powerpc64 = "ld64.so.1"
+GLIBC_LDSO_mips64 = "ld64.so.1"
 
 export CROSS_COMPILE="${TARGET_PREFIX}"
 
@@ -62,10 +70,14 @@ do_install() {
        install -d ${D}${bindir}
        rm -f ${D}${bindir}/ldd
        lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
+       lnr ${D}${libdir}/libc.so ${D}${base_libdir}/${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
 }
 
 RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev"
--

2.19.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#3 lore raw
Quoted 8 lines · Andre McCurdy
Quoted 3 lines · Khem Raj

This is a step towards running pebuilt applications for glibc on musl There are many realworld applications which are not always built from source, especially provided by third party

Should these symlinks go in a separate package (musl-glibc-compat ?) so that only people trying to run closed source glibc binaries on musl need to see them?

I thought about doing it but then this would mean we have to install that package in image explicitly and here it’s practically adding no extra code so decided against it but I am open if people feel strongly against it

Quoted 53 lines

Review

Quoted 7 lines
---
 meta/recipes-core/musl/musl_git.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
(quoted diff) +0 -0

b/meta/recipes-core/musl/musl_git.bb

meta/recipes-core/musl/musl_git.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils \ · line 30

Quoted 9 lines

index be31718e3a..a830c36eeb 100644

meta/recipes-core/musl/musl_git.bb +2 -0
@@ -26,6 +26,14 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
            bsd-headers \
            libssp-nonshared \
           "
+GLIBC_LDSO ?= "ld.so.1"
+GLIBC_LDSO_arm = "${@ bb.utils.contains('TUNE_FEATURES',

'callconvention-hard', 'ld-linux-armhf.so.3', 'ld-linux.so.3', d)}"

Quoted 10 lines
meta/recipes-core/musl/musl_git.bb +6 -0
+GLIBC_LDSO_aarch64 = "ld-linux-aarch64.so.1"
+GLIBC_LDSO_x86 = "ld-linux.so.2"
+GLIBC_LDSO_x86_64 = "ld-linux-x86-64.so.2"
+GLIBC_LDSO_x32 = "ld-linux-x32.so.2"
+GLIBC_LDSO_powerpc64 = "ld64.so.1"
+GLIBC_LDSO_mips64 = "ld64.so.1"
 
 export CROSS_COMPILE="${TARGET_PREFIX}"
 

meta/recipes-core/musl/musl_git.bb do_install() { · line 78

Quoted 9 lines
meta/recipes-core/musl/musl_git.bb +2 -0
@@ -62,10 +70,14 @@ do_install() {
        install -d ${D}${bindir}
        rm -f ${D}${bindir}/ldd
        lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
+       lnr ${D}${libdir}/libc.so ${D}${base_libdir}/${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

meta/recipes-core/musl/musl_git.bb do_install() {

Quoted 5 lines
meta/recipes-core/musl/musl_git.bb +2 -0
+               ln -sf libc.so ${D}${libdir}/$i
+       done
 }
 
 RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev

libssp-nonshared-staticdev"

Quoted 8 lines

--
2.19.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core