From e052ec7b1fe62451902e2a3f5ab569e402032b0b Mon Sep 17 00:00:00 2001 From: Wayne Ren Date: Wed, 9 Mar 2022 10:35:40 +0800 Subject: [PATCH] glibc: optimize packages context * remove the sub packages not provided now * currently, all .so and .a are packaged together Signed-off-by: Wayne Ren --- .../recipes-core/glibc/glibc_2.34.bb | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/meta-openeuler/recipes-core/glibc/glibc_2.34.bb b/meta-openeuler/recipes-core/glibc/glibc_2.34.bb index 1eaee58de62..8204ac95a8c 100644 --- a/meta-openeuler/recipes-core/glibc/glibc_2.34.bb +++ b/meta-openeuler/recipes-core/glibc/glibc_2.34.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage malloc-debug libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" +PACKAGES = "${PN} ${PN}-dev ${PN}-staticdev" #DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" PROVIDES += "virtual/libc virtual/libiconv virtual/libintl" @@ -32,7 +32,6 @@ S_aarch64 = "${WORKDIR}/openeuler_gcc_arm64le" S_arm = "${WORKDIR}/openeuler_gcc_arm32le" PSEUDO_DISABLED = "1" -PRIVATE_LIBS_${PN}-dev_append = "libdl.so.2 libresolv.so.2 libm.so.6 librt.so.1 libnsl.so.1 libnss_files.so.2 " do_configure() { : @@ -54,25 +53,16 @@ do_install() { } FILES_${PN} = " \ - ${base_libdir}/ld-linux*.so* \ - ${libdir}/libc.so \ - ${base_libdir}/libm.so \ - ${base_libdir}/libc.so.6 \ - ${base_libdir}/libm.so.6 \ - ${libdir}/libcrypt.so \ - ${libdir}/libnss_compat.so \ - ${libdir}/libresolv.so \ - ${base_libdir}/libcrypt.so.1 \ - ${base_libdir}/libnss_compat.so.2 \ - ${base_libdir}/libnsl.so.1 \ - {base_libdir}/libnss_files.so.2 \ - ${base_libdir}/libresolv.so.2 \ - ${base_libdir}/librt* \ - ${base_libdir}/libpthread* \ - ${base_libdir}/libutil* \ - ${base_libdir}/libgcc_s.so.1 \ - ${base_libdir}/libtirpc.so* \ + ${base_libdir}/*.so \ + ${base_libdir}/*.so.* \ + ${libdir}/*.so \ + ${libdir}/*.so.* \ " +FILES_${PN}-staticdev = " \ + ${base_libdir}/*.a \ + ${libdir}/*.a \ +" + INSANE_SKIP_${PN} += "installed-vs-shipped" INSANE_SKIP += "dev-elf dev-so" -- Gitee