summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2010-09-21 16:52:53 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-21 23:36:59 +0100
commit8c33bfc84a2c8226e03a85b3eab3206db7509ef1 (patch)
treee5fd878fc418c1798d977970872b3ee1440c8ff8
parent11a92051e714a72523a3ce4d5c627d216d076f61 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc2
-rw-r--r--meta/recipes-core/glibc/glibc_2.10.1.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 8827c4788f..35001fd6fc 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -35,7 +35,7 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
35PACKAGES = "${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" 35PACKAGES = "${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"
36 36
37PACKAGES_DYNAMIC = " \ 37PACKAGES_DYNAMIC = " \
38 glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \ 38 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \
39 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ 39 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
40 locale-base-*" 40 locale-base-*"
41 41
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 475e30eda7..1b633a7d47 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -2,7 +2,7 @@ require eglibc.inc
2 2
3DEPENDS += "gperf-native" 3DEPENDS += "gperf-native"
4FILESPATHPKG =. "eglibc-svn:" 4FILESPATHPKG =. "eglibc-svn:"
5PR = "r6" 5PR = "r7"
6SRCREV="10809" 6SRCREV="10809"
7EGLIBC_BRANCH="eglibc-2_12" 7EGLIBC_BRANCH="eglibc-2_12"
8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ 8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
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
38PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* \ 38PACKAGES_DYNAMIC = "glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* locale-base-* \
39 glibc-binary-localedata-*" 39 glibc-binary-localedata-*"
40 40
41libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ 41libc_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"
5PACKAGES_DYNAMIC = "libc6*" 5PACKAGES_DYNAMIC = "libc6*"
6RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" 6RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
7 7
8PR = "r4" 8PR = "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
11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"