From eb713ede6d6ee68e0239e720e545b3787db879e4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Jan 2011 13:07:50 +0100 Subject: [PATCH] meta-angstrom: clean up libc preferred providers a bit Signed-off-by: Koen Kooi --- conf/distro/include/angstrom.inc | 13 +++++++++++++ conf/distro/include/eglibc.inc | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index ab9fb5f..f910e46 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -32,6 +32,19 @@ PSTAGE_EXTRAPATH = "${LIBC}" CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}" + +# The things *libc can provide. +PREFERRED_PROVIDER_virtual/libc = "${ANGSTROMLIBC}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${ANGSTROMLIBC}-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${ANGSTROMLIBC}" + +# And the same as above for the nativesdk +PREFERRED_PROVIDER_virtual/libc-nativesdk = "${ANGSTROMLIBC}-nativesdk" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${ANGSTROMLIBC}-initial-nativesdk" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "${ANGSTROMLIBC}-nativesdk" + +PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk" + require conf/distro/include/angstrom-${LIBC}.inc # Set some java bits diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc index 9b1974c..f837cac 100644 --- a/conf/distro/include/eglibc.inc +++ b/conf/distro/include/eglibc.inc @@ -4,11 +4,11 @@ OVERRIDES =. "libc-glibc:" # The things eglibc can provide. We default to wanting eglibc to provide them. 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/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "eglibc-nativesdk" +# And the same as above for the nativesdk +PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/libintl-nativesdk ?= "eglibc-nativesdk" + # eglibc is configured for OLDEST_KERNEL kernel version, so we set minimal # sane versions there