From c1e7995c34ae8f18acded5838200e4fce402696d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 18 Aug 2015 15:55:47 +0200 Subject: glibc-package: use ${PN} in INSANE_SKIP * INSANE_SKIP_${PN}_append_aarch64 is causing following warning in some setups: WARNING: Variable key INSANE_SKIP_${PN} () replaces original key INSANE_SKIP_glibc (). * in worst case this will be applied also for glibc-initial package which is using the same glibc-package.inc, but glibc-initial doesn't create any packages so we should be fine * someone building for aarch64 should confirm verify that this INSANE_SKIP is still needed and cannot be fixed properly it was introduced in: commit aeb6f53dd607ceb0d2265a05c27f751109c73752 Author: Mark Hatle Date: Thu Dec 18 16:51:13 2014 +0800 glibc-package: aarch64 enable symlink for ABI compliance aarch64 requires the ld.so to be present in /lib, even if the rest of the libraries are installed into an alternative directory. See: https://sourceware.org/glibc/wiki/ABIList Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie (From OE-Core rev: 34ffa04a5030d23070aa4d389d1cc51438525670) Signed-off-by: Martin Jansa Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index def0e0c142..c72a49e0fd 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -35,7 +35,7 @@ RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" RPROVIDES_${PN}-dbg = "eglibc-dbg" libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" -INSANE_SKIP_glibc_append_aarch64 = " libdir" +INSANE_SKIP_${PN}_append_aarch64 = " libdir" FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" FILES_ldd = "${bindir}/ldd" -- cgit v1.2.3-54-g00ecf