summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/musl
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-06-12 12:43:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-14 15:05:11 +0100
commit3a55f9a33a52f2101d18bab8000920a9f9f31096 (patch)
treef7e6dd2583e4add6aefc2faf02ecd1eac3af9668 /meta/recipes-core/musl
parentc54865c1257f58854619846b9be4a618a4355949 (diff)
downloadpoky-3a55f9a33a52f2101d18bab8000920a9f9f31096.tar.gz
musl: Do not package glibc loader
This was a ad-hoc solution which did not really work in all cases, now gcompat is provided to deal with glibc based prebuilts, therefore there is no need to provide this package (From OE-Core rev: e2d54f02bcde7a95235a61b9622c584a77c4e9bc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/musl')
-rw-r--r--meta/recipes-core/musl/gcompat_git.bb2
-rw-r--r--meta/recipes-core/musl/musl_git.bb4
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb
index 6792c0be70..e1ae052c44 100644
--- a/meta/recipes-core/musl/gcompat_git.bb
+++ b/meta/recipes-core/musl/gcompat_git.bb
@@ -34,6 +34,8 @@ do_compile () {
34do_install () { 34do_install () {
35 oe_runmake install 'DESTDIR=${D}' 35 oe_runmake install 'DESTDIR=${D}'
36} 36}
37
38RPROVIDES_${PN} += "musl-glibc-compat"
37# 39#
38# We will skip parsing for non-musl systems 40# We will skip parsing for non-musl systems
39# 41#
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 795b888bb3..6569d1b37b 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -68,13 +68,9 @@ do_install() {
68 echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path 68 echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
69 rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} 69 rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
70 lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd 70 lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
71 lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO}
72} 71}
73 72
74PACKAGES =+ "${PN}-glibc-compat"
75
76FILES_${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" 73FILES_${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path"
77FILES_${PN}-glibc-compat += "${GLIBC_LDSO}"
78FILES_${PN}-staticdev = "${libdir}/libc.a" 74FILES_${PN}-staticdev = "${libdir}/libc.a"
79FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ 75FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \
80 ${libdir}/libpthread.a ${libdir}/libresolv.a \ 76 ${libdir}/libpthread.a ${libdir}/libresolv.a \