Patchwork external-sourcery: add missing providers

login
register
mail settings
Submitter Saul Wold
Date July 25, 2013, 9:35 p.m.
Message ID <1374788144-1380-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/54535/
State Accepted
Commit 09deeef20ee5a0c12ad4fd89cace6e0fb832d5b1
Headers show

Comments

Saul Wold - July 25, 2013, 9:35 p.m.
Addess the issue with multiple .bb providers

ERROR: Multiple .bb files are due to be built which each provide virtual/libc (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
 This usually means one provides something the other doesn't and should.
ERROR: Multiple .bb files are due to be built which each provide virtual/arm-none-linux-gnueabi-libc-for-gcc (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
 This usually means one provides something the other doesn't and should.
ERROR: Multiple .bb files are due to be built which each provide virtual/libiconv (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
 This usually means one provides something the other doesn't and should.

Thanks to Kergoth (Chris Larson) and Lpapp (Lazslo)

[YOCTO #4908]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/distro/include/tcmode-external-sourcery.inc | 3 +++
 meta/recipes-core/meta/external-sourcery-toolchain.bb | 2 ++
 2 files changed, 5 insertions(+)
Henning Heinold - July 26, 2013, 10:11 a.m.
On Thu, Jul 25, 2013 at 02:35:44PM -0700, Saul Wold wrote:
> Addess the issue with multiple .bb providers
> 
> ERROR: Multiple .bb files are due to be built which each provide virtual/libc (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
>  This usually means one provides something the other doesn't and should.
> ERROR: Multiple .bb files are due to be built which each provide virtual/arm-none-linux-gnueabi-libc-for-gcc (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
>  This usually means one provides something the other doesn't and should.
> ERROR: Multiple .bb files are due to be built which each provide virtual/libiconv (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
>  This usually means one provides something the other doesn't and should.
> 
> Thanks to Kergoth (Chris Larson) and Lpapp (Lazslo)
> 
> [YOCTO #4908]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/conf/distro/include/tcmode-external-sourcery.inc | 3 +++
>  meta/recipes-core/meta/external-sourcery-toolchain.bb | 2 ++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc
> index 53e6653..d6cac74 100644
> --- a/meta/conf/distro/include/tcmode-external-sourcery.inc
> +++ b/meta/conf/distro/include/tcmode-external-sourcery.inc
> @@ -27,13 +27,16 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-sourcery
>  PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-sourcery-toolchain"
> +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain"
> +PREFERRED_PROVIDER_eglibc = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_virtual/libc = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_virtual/libintl = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_virtual/libiconv = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_glibc-thread-db = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-sourcery-toolchain"
> +PREFERRED_PROVIDER_virtual/linux-libc-headers-dev = "external-sourcery-toolchain"
>  PREFERRED_PROVIDER_gdbserver ??= "external-sourcery-toolchain"
>  
>  # No need to re-compile the locale files
> diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> index 5fed30a..41d86d6 100644
> --- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
> +++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> @@ -16,12 +16,14 @@ PROVIDES += "\
>  	virtual/${TARGET_PREFIX}gcc-intermediate \
>  	virtual/${TARGET_PREFIX}binutils \
>  	virtual/${TARGET_PREFIX}libc-for-gcc \
> +	virtual/${TARGET_PREFIX}libc-initial \
>  	virtual/${TARGET_PREFIX}compilerlibs \
>  	virtual/libc \
>  	virtual/libintl \
>  	virtual/libiconv \
>  	glibc-thread-db \
>  	libgcc \
> +	eglibc \
>  	virtual/linux-libc-headers \
>  "
>  PV = "${CSL_VER_MAIN}"
> -- 
> 1.8.1.4

Hi Saul,

shouldn't we add uclibc too or will you wait until someone comes up
with an uclibc based external toolchain?

Bye Henning
Khem Raj - July 26, 2013, 2:30 p.m.
On Jul 26, 2013, at 3:11 AM, Henning Heinold <heinold@inf.fu-berlin.de> wrote:

> On Thu, Jul 25, 2013 at 02:35:44PM -0700, Saul Wold wrote:
>> Addess the issue with multiple .bb providers
>> 
>> ERROR: Multiple .bb files are due to be built which each provide virtual/libc (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
>> This usually means one provides something the other doesn't and should.
>> ERROR: Multiple .bb files are due to be built which each provide virtual/arm-none-linux-gnueabi-libc-for-gcc (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
>> This usually means one provides something the other doesn't and should.
>> ERROR: Multiple .bb files are due to be built which each provide virtual/libiconv (/srv/hdd/releases/dylan/meta/recipes-core/eglibc/eglibc_2.17.bb /srv/hdd/releases/dylan/meta/recipes-core/meta/external-sourcery-toolchain.bb).
>> This usually means one provides something the other doesn't and should.
>> 
>> Thanks to Kergoth (Chris Larson) and Lpapp (Lazslo)
>> 
>> [YOCTO #4908]
>> 
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>> meta/conf/distro/include/tcmode-external-sourcery.inc | 3 +++
>> meta/recipes-core/meta/external-sourcery-toolchain.bb | 2 ++
>> 2 files changed, 5 insertions(+)
>> 
>> diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc
>> index 53e6653..d6cac74 100644
>> --- a/meta/conf/distro/include/tcmode-external-sourcery.inc
>> +++ b/meta/conf/distro/include/tcmode-external-sourcery.inc
>> @@ -27,13 +27,16 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-sourcery
>> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-sourcery-toolchain"
>> +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain"
>> +PREFERRED_PROVIDER_eglibc = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_virtual/libc = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_virtual/libintl = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_virtual/libiconv = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_glibc-thread-db = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-sourcery-toolchain"
>> +PREFERRED_PROVIDER_virtual/linux-libc-headers-dev = "external-sourcery-toolchain"
>> PREFERRED_PROVIDER_gdbserver ??= "external-sourcery-toolchain"
>> 
>> # No need to re-compile the locale files
>> diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
>> index 5fed30a..41d86d6 100644
>> --- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
>> +++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
>> @@ -16,12 +16,14 @@ PROVIDES += "\
>> 	virtual/${TARGET_PREFIX}gcc-intermediate \
>> 	virtual/${TARGET_PREFIX}binutils \
>> 	virtual/${TARGET_PREFIX}libc-for-gcc \
>> +	virtual/${TARGET_PREFIX}libc-initial \
>> 	virtual/${TARGET_PREFIX}compilerlibs \
>> 	virtual/libc \
>> 	virtual/libintl \
>> 	virtual/libiconv \
>> 	glibc-thread-db \
>> 	libgcc \
>> +	eglibc \
>> 	virtual/linux-libc-headers \
>> "
>> PV = "${CSL_VER_MAIN}"
>> -- 
>> 1.8.1.4
> 
> Hi Saul,
> 
> shouldn't we add uclibc too or will you wait until someone comes up
> with an uclibc based external toolchain?

codesourcery does not provide uclibc toolchains, when there is a vendor
with uclibc toolchains we will cross that bridge.

Patch

diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc
index 53e6653..d6cac74 100644
--- a/meta/conf/distro/include/tcmode-external-sourcery.inc
+++ b/meta/conf/distro/include/tcmode-external-sourcery.inc
@@ -27,13 +27,16 @@  PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "external-sourcery
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-sourcery-toolchain"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain"
+PREFERRED_PROVIDER_eglibc = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_virtual/libc = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_virtual/libintl = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_virtual/libiconv = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_glibc-thread-db = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-sourcery-toolchain"
+PREFERRED_PROVIDER_virtual/linux-libc-headers-dev = "external-sourcery-toolchain"
 PREFERRED_PROVIDER_gdbserver ??= "external-sourcery-toolchain"
 
 # No need to re-compile the locale files
diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
index 5fed30a..41d86d6 100644
--- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
+++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
@@ -16,12 +16,14 @@  PROVIDES += "\
 	virtual/${TARGET_PREFIX}gcc-intermediate \
 	virtual/${TARGET_PREFIX}binutils \
 	virtual/${TARGET_PREFIX}libc-for-gcc \
+	virtual/${TARGET_PREFIX}libc-initial \
 	virtual/${TARGET_PREFIX}compilerlibs \
 	virtual/libc \
 	virtual/libintl \
 	virtual/libiconv \
 	glibc-thread-db \
 	libgcc \
+	eglibc \
 	virtual/linux-libc-headers \
 "
 PV = "${CSL_VER_MAIN}"