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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb
index 6792c0be70ced10453eabce139583f48df04b0f0..e1ae052c44be2fb4e5402597b7badbc6b04b8fd3 100644 (file)
--- a/meta/recipes-core/musl/gcompat_git.bb
+++ b/meta/recipes-core/musl/gcompat_git.bb
@@ -34,6 +34,8 @@ do_compile () {
 do_install () {
        oe_runmake install 'DESTDIR=${D}'
 }
+
+RPROVIDES_${PN} += "musl-glibc-compat"
 #
 # We will skip parsing for non-musl systems
 #

diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 795b888bb304bdd676e7ac9d737d44914c95e560..6569d1b37bc5c79884463c7d54cb20b06337ff15 100644 (file)
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -68,13 +68,9 @@ do_install() {
         echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
        rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
        lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
-       lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO}
 }
 
-PACKAGES =+ "${PN}-glibc-compat"
-
 FILES_${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path"
-FILES_${PN}-glibc-compat += "${GLIBC_LDSO}"
 FILES_${PN}-staticdev = "${libdir}/libc.a"
 FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \
                     ${libdir}/libpthread.a ${libdir}/libresolv.a \