diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-09-08 12:31:39 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-10 12:53:46 +0100 |
commit | d6e8013a8c1c439eef28301b1cc3b6f7674ee63b (patch) | |
tree | 209e5589001011a0bddbc0d61d83deae89d206a2 /meta/recipes-core/glibc | |
parent | b273ca2be051cab71bd07e11a1a4a5106e64f5ce (diff) | |
download | poky-d6e8013a8c1c439eef28301b1cc3b6f7674ee63b.tar.gz |
[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 <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 33 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.10.1.bb | 2 |
2 files changed, 24 insertions, 11 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 9aaa4f3873..13f92236be 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -27,15 +27,28 @@ ENABLE_BINARY_LOCALE_GENERATION_pn-glibc-nativesdk = "0" | |||
27 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions | 27 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions |
28 | BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" | 28 | BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" |
29 | 29 | ||
30 | PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" | 30 | PKGSUFFIX = "" |
31 | PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" | 31 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" |
32 | 32 | ||
33 | libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*" | 33 | PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \ |
34 | ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \ | ||
35 | ${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ | ||
36 | ${PN}-pcprofile" | ||
37 | |||
38 | PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* \ | ||
39 | glibc-binary-localedata-*" | ||
40 | |||
41 | libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ | ||
42 | ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* \ | ||
43 | ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* \ | ||
44 | ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* \ | ||
45 | ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*" | ||
34 | 46 | ||
35 | # The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc | 47 | # The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc |
36 | # Solution: Make them both the same thing, then it doesn't matter | 48 | # Solution: Make them both the same thing, then it doesn't matter |
37 | 49 | ||
38 | glibcfiles = "${sysconfdir} ${libc_baselibs} ${base_sbindir}/ldconfig ${libexecdir}/* ${datadir}/zoneinfo" | 50 | glibcfiles = "${sysconfdir} ${libc_baselibs} ${base_sbindir}/ldconfig \ |
51 | ${libexecdir}/* ${datadir}/zoneinfo" | ||
39 | glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ | 52 | glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ |
40 | ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ | 53 | ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ |
41 | ${libdir}/gconv/.debug ${libexecdir}/*/.debug" | 54 | ${libdir}/gconv/.debug ${libexecdir}/*/.debug" |
@@ -45,22 +58,22 @@ glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${lib | |||
45 | 58 | ||
46 | FILES_glibc = "${glibcfiles}" | 59 | FILES_glibc = "${glibcfiles}" |
47 | FILES_${PN} = "${glibcfiles}" | 60 | FILES_${PN} = "${glibcfiles}" |
48 | FILES_ldd = "${bindir}/ldd" | 61 | FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" |
49 | FILES_libsegfault = "${base_libdir}/libSegFault*" | 62 | FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" |
50 | FILES_glibc-extra-nss = "${base_libdir}/libnss*" | 63 | FILES_glibc-extra-nss = "${base_libdir}/libnss*" |
51 | FILES_sln = "${base_sbindir}/sln" | 64 | FILES_sln = "${base_sbindir}/sln" |
52 | FILES_glibc-dev = "${glibcdevfiles}" | 65 | FILES_glibc-dev = "${glibcdevfiles}" |
53 | FILES_${PN}-dev = "${glibcdevfiles}" | 66 | FILES_${PN}-dev = "${glibcdevfiles}" |
54 | FILES_glibc-dbg = "${glibcdbgfiles}" | 67 | FILES_glibc-dbg = "${glibcdbgfiles}" |
55 | FILES_${PN}-dbg = "${glibcdbgfiles}" | 68 | FILES_${PN}-dbg = "${glibcdbgfiles}" |
56 | FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*" | 69 | FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*" |
57 | FILES_glibc-utils = "${bindir}/* ${sbindir}/*" | 70 | FILES_glibc-utils = "${bindir}/* ${sbindir}/*" |
58 | FILES_glibc-gconv = "${libdir}/gconv/*" | 71 | FILES_glibc-gconv = "${libdir}/gconv/*" |
59 | FILES_catchsegv = "${bindir}/catchsegv" | 72 | FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" |
60 | RDEPENDS_catchsegv = "libsegfault" | 73 | RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" |
61 | FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so" | 74 | FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so" |
62 | FILES_glibc-thread-db = "${base_libdir}/libthread_db*" | 75 | FILES_glibc-thread-db = "${base_libdir}/libthread_db*" |
63 | FILES_localedef = "${bindir}/localedef" | 76 | FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" |
64 | RPROVIDES_glibc-dev += "libc-dev" | 77 | RPROVIDES_glibc-dev += "libc-dev" |
65 | 78 | ||
66 | DESCRIPTION_sln = "glibc: create symbolic links between files" | 79 | DESCRIPTION_sln = "glibc: create symbolic links between files" |
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb index 2b87186227..34aab835b7 100644 --- a/meta/recipes-core/glibc/glibc_2.10.1.bb +++ b/meta/recipes-core/glibc/glibc_2.10.1.bb | |||
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" | |||
5 | PACKAGES_DYNAMIC = "libc6*" | 5 | PACKAGES_DYNAMIC = "libc6*" |
6 | RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" | 6 | RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" |
7 | 7 | ||
8 | PR = "r3" | 8 | PR = "r4" |
9 | 9 | ||
10 | # the -isystem in bitbake.conf screws up glibc do_stage | 10 | # the -isystem in bitbake.conf screws up glibc do_stage |
11 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 11 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |