summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2010-09-21 16:49:15 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-21 23:36:37 +0100
commit11a92051e714a72523a3ce4d5c627d216d076f61 (patch)
treebd82f4611723d00f8e8fc75b2069dd20eb016db2
parent73049a3431dc7cdfe841c2b697090e236cd2c301 (diff)
downloadpoky-11a92051e714a72523a3ce4d5c627d216d076f61.tar.gz
poky-eglibc.inc: fix multiple providers for virtual/libc-nativesdk and other
This commit fixes the following error while doing this: bitbake poky-image-minimal NOTE: multiple providers are available for virtual/libc-nativesdk (glibc-nativesdk, eglibc-nativesdk) NOTE: consider defining a PREFERRED_PROVIDER entry to match virtual/libc-nativesdk NOTE: multiple providers are available for virtual/i586-pokysdk-linux-libc-initial-nativesdk (glibc-initial-nativesdk, eglibc-initial-nativesdk) NOTE: consider defining a PREFERRED_PROVIDER entry to match virtual/i586-pokysdk-linux-libc-initial-nativesdk And bumped PR. This partly fixes [BUGID #329] Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-rw-r--r--meta/conf/distro/include/poky-eglibc.inc10
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/poky-eglibc.inc
index c4e002b6e3..e15fb0f43d 100644
--- a/meta/conf/distro/include/poky-eglibc.inc
+++ b/meta/conf/distro/include/poky-eglibc.inc
@@ -5,11 +5,17 @@
5# Add glibc overrides to the overrides for eglibc. 5# Add glibc overrides to the overrides for eglibc.
6OVERRIDES .= ":libc-glibc" 6OVERRIDES .= ":libc-glibc"
7 7
8#eglibc
8PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" 9PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
9PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" 10PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
10PREFERRED_PROVIDER_virtual/libc ?= "eglibc" 11PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" 12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial"
12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc" 13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc ?= "eglibc"
14
15#eglibc-nativesdk
16PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
17PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk"
18PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk"
13 19
14TARGET_OS = "${GLIBCTARGETOS}" 20TARGET_OS = "${GLIBCTARGETOS}"
15 21
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 1e2ee80dd7..475e30eda7 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 = "r5" 5PR = "r6"
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 \