diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-07-25 14:15:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-12 13:14:18 +0100 |
commit | b4ba3269102424b614d91ca8be10501176042f62 (patch) | |
tree | abfba5e7863013396e0d5c747e792907390be566 | |
parent | 2bd2fa985b40c19a0f672a686719442db726da1f (diff) | |
download | poky-b4ba3269102424b614d91ca8be10501176042f62.tar.gz |
external-sourcery: add missing providers
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]
(From OE-Core master rev: 09deeef20ee5a0c12ad4fd89cace6e0fb832d5b1)
(From OE-Core rev: cbec047b1d59f6082d840711fae5672f30c3436c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/tcmode-external-sourcery.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/meta/external-sourcery-toolchain.bb | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc index 098c724e02..7a1ca69064 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 | |||
27 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-sourcery-toolchain" | 27 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "external-sourcery-toolchain" |
28 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-sourcery-toolchain" | 28 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "external-sourcery-toolchain" |
29 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-sourcery-toolchain" | 29 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-sourcery-toolchain" |
30 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "external-sourcery-toolchain" | ||
30 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain" | 31 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "external-sourcery-toolchain" |
31 | PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain" | 32 | PREFERRED_PROVIDER_libgcc = "external-sourcery-toolchain" |
33 | PREFERRED_PROVIDER_eglibc = "external-sourcery-toolchain" | ||
32 | PREFERRED_PROVIDER_virtual/libc = "external-sourcery-toolchain" | 34 | PREFERRED_PROVIDER_virtual/libc = "external-sourcery-toolchain" |
33 | PREFERRED_PROVIDER_virtual/libintl = "external-sourcery-toolchain" | 35 | PREFERRED_PROVIDER_virtual/libintl = "external-sourcery-toolchain" |
34 | PREFERRED_PROVIDER_virtual/libiconv = "external-sourcery-toolchain" | 36 | PREFERRED_PROVIDER_virtual/libiconv = "external-sourcery-toolchain" |
35 | PREFERRED_PROVIDER_glibc-thread-db = "external-sourcery-toolchain" | 37 | PREFERRED_PROVIDER_glibc-thread-db = "external-sourcery-toolchain" |
36 | PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-sourcery-toolchain" | 38 | PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-sourcery-toolchain" |
39 | PREFERRED_PROVIDER_virtual/linux-libc-headers-dev = "external-sourcery-toolchain" | ||
37 | PREFERRED_PROVIDER_gdbserver ??= "external-sourcery-toolchain" | 40 | PREFERRED_PROVIDER_gdbserver ??= "external-sourcery-toolchain" |
38 | 41 | ||
39 | # No need to re-compile the locale files | 42 | # 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 74c82ec978..ba2c08c061 100644 --- a/meta/recipes-core/meta/external-sourcery-toolchain.bb +++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb | |||
@@ -15,12 +15,14 @@ PROVIDES += "\ | |||
15 | virtual/${TARGET_PREFIX}gcc-intermediate \ | 15 | virtual/${TARGET_PREFIX}gcc-intermediate \ |
16 | virtual/${TARGET_PREFIX}binutils \ | 16 | virtual/${TARGET_PREFIX}binutils \ |
17 | virtual/${TARGET_PREFIX}libc-for-gcc \ | 17 | virtual/${TARGET_PREFIX}libc-for-gcc \ |
18 | virtual/${TARGET_PREFIX}libc-initial \ | ||
18 | virtual/${TARGET_PREFIX}compilerlibs \ | 19 | virtual/${TARGET_PREFIX}compilerlibs \ |
19 | virtual/libc \ | 20 | virtual/libc \ |
20 | virtual/libintl \ | 21 | virtual/libintl \ |
21 | virtual/libiconv \ | 22 | virtual/libiconv \ |
22 | glibc-thread-db \ | 23 | glibc-thread-db \ |
23 | libgcc \ | 24 | libgcc \ |
25 | eglibc \ | ||
24 | virtual/linux-libc-headers \ | 26 | virtual/linux-libc-headers \ |
25 | " | 27 | " |
26 | PV = "${CSL_VER_MAIN}" | 28 | PV = "${CSL_VER_MAIN}" |