diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-06-12 12:43:15 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-14 15:05:08 +0100 |
| commit | e2d54f02bcde7a95235a61b9622c584a77c4e9bc (patch) | |
| tree | afa875d7c630d9ab01b0f5da2025d453286b8e9e | |
| parent | 5efe7c06c8555672b535adae587596f65bff4fc5 (diff) | |
| download | openembedded-core-contrib-e2d54f02bcde7a95235a61b9622c584a77c4e9bc.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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/musl/gcompat_git.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 4 |
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 () { 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 \ |