From 11a92051e714a72523a3ce4d5c627d216d076f61 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 21 Sep 2010 16:49:15 +0800 Subject: 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 --- meta/conf/distro/include/poky-eglibc.inc | 10 ++++++++-- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'meta') 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 @@ # Add glibc overrides to the overrides for eglibc. OVERRIDES .= ":libc-glibc" +#eglibc PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc ?= "eglibc" + +#eglibc-nativesdk +PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk" TARGET_OS = "${GLIBCTARGETOS}" 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 DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r5" +PR = "r6" SRCREV="10809" EGLIBC_BRANCH="eglibc-2_12" SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ -- cgit v1.2.3-54-g00ecf