diff options
| author | Dexuan Cui <dexuan.cui@intel.com> | 2010-09-21 16:52:53 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-21 23:36:59 +0100 |
| commit | 8c33bfc84a2c8226e03a85b3eab3206db7509ef1 (patch) | |
| tree | e5fd878fc418c1798d977970872b3ee1440c8ff8 /meta/recipes-core/glibc | |
| parent | 11a92051e714a72523a3ce4d5c627d216d076f61 (diff) | |
| download | poky-8c33bfc84a2c8226e03a85b3eab3206db7509ef1.tar.gz | |
[e]glibc-package.inc: fix multiple providers for glibc-gconv-iso8859-1
This commit fixes the following error while doing this:
bitbake poky-image-sato
ERROR: Conflicting PREFERRED_PROVIDER entries were found which resulted in an attempt to select multiple providers (['virtual:nativesdk:/distro/dcui/dexuan/meta/recipes-core/eglibc/eglibc_2.12.bb', '/distro/dcui/dexuan/meta/recipes-core/eglibc/eglibc_2.12.bb']) for runtime dependency glibc-gconv-iso8859-1 The entries resulting in this conflict were: ['PREFERRED_PROVIDER_virtual/libc-nativesdk = eglibc-nativesdk', 'PREFERRED_PROVIDER_virtual/libc = eglibc']
NOTE: multiple providers are available for runtime glibc-gconv-iso8859-1 (eglibc, eglibc-nativesdk, glibc-nativesdk, glibc, external-csl-toolchain, external-poky-toolchain)
NOTE: consider defining a PREFERRED_PROVIDER entry to match glibc-gconv-iso8859-1
And bumped PR.
This partly fixes [BUGID #329]
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta/recipes-core/glibc')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.10.1.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 13f92236be..3c9132820d 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
| @@ -35,7 +35,7 @@ PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFI | |||
| 35 | ${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ | 35 | ${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ |
| 36 | ${PN}-pcprofile" | 36 | ${PN}-pcprofile" |
| 37 | 37 | ||
| 38 | PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* \ | 38 | PACKAGES_DYNAMIC = "glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* locale-base-* \ |
| 39 | glibc-binary-localedata-*" | 39 | glibc-binary-localedata-*" |
| 40 | 40 | ||
| 41 | libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ | 41 | libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ |
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb index 34aab835b7..7f97273f70 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 = "r4" | 8 | PR = "r5" |
| 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}" |