From 3a55f9a33a52f2101d18bab8000920a9f9f31096 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 12 Jun 2021 12:43:15 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/musl/gcompat_git.bb | 2 ++ meta/recipes-core/musl/musl_git.bb | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'meta') 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 () { 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 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() { 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 \ -- cgit v1.2.3-54-g00ecf