From d6e8013a8c1c439eef28301b1cc3b6f7674ee63b Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 8 Sep 2010 12:31:39 -0700 Subject: [e]glibc-package.inc: fix providers for libsegfault and other [e]glibc-nativesdk should not be providing libsegfault. This commit fixes the following error while doing this: bitbake poky-image-minimal-initramfs DEBUG: providers for libsegfault are: ['glibc-nativesdk', 'glibc', 'eglibc-nativesdk', 'external-csl-toolchain', 'eglibc', 'external-poky-toolchain'] DEBUG: selecting virtual:nativesdk:/rphome/poky/meta/recipes-core/glibc/glibc_2.10.1.bb as PREFERRED_VERSION 2.10.1 of package glibc-nativesdk (for item libsegfault) DEBUG: selecting /rphome/poky/meta/recipes-core/glibc/glibc_2.10.1.bb as PREFERRED_VERSION 2.10.1 of package glibc (for item libsegfault) NOTE: checking PREFERRED_PROVIDER_glibc-nativesdk NOTE: checking PREFERRED_PROVIDER_glibc-nativesdk-2.10.1 NOTE: checking PREFERRED_PROVIDER_glibc-nativesdk-2.10.1-r3 NOTE: checking PREFERRED_PROVIDER_virtual/libc-nativesdk NOTE: selecting glibc-nativesdk to satisfy runtime libsegfault due to PREFERRED_PROVIDER_virtual/libc-nativesdk = glibc-nativesdk And bumped PR. Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc-package.inc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'meta/recipes-core/eglibc/eglibc-package.inc') diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index a315e05d65..8827c4788f 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -29,7 +29,10 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PACKAGES = "${PN}-dbg ${PN} catchsegv sln nscd ldd localedef ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" +PKGSUFFIX = "" +PKGSUFFIX_virtclass-nativesdk = "-nativesdk" + +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" PACKAGES_DYNAMIC = " \ glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \ @@ -49,8 +52,8 @@ RPROVIDES_eglibc-dbg = "glibc-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}/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" FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}" -FILES_ldd = "${bindir}/ldd" -FILES_libsegfault = "${base_libdir}/libSegFault*" +FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" +FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" FILES_libcidn = "${base_libdir}/libcidn*.so" FILES_libmemusage = "${base_libdir}/libmemusage.so" FILES_eglibc-extra-nss = "${base_libdir}/libnss*" @@ -58,15 +61,15 @@ FILES_sln = "/sbin/sln" FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" -FILES_nscd = "${sbindir}/nscd*" +FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" FILES_eglibc-gconv = "${libdir}/gconv/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug" -FILES_catchsegv = "${bindir}/catchsegv" -RDEPENDS_catchsegv = "libsegfault" +FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" +RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db = "${base_libdir}/libthread_db*" -FILES_localedef = "${bindir}/localedef" +FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" RPROVIDES_eglibc-dev += "libc-dev" DESCRIPTION_sln = "eglibc: create symbolic links between files" -- cgit 1.2.3-korg