Signed-off-by: Khem Raj <raj.k...@gmail.com> --- conf/distro/angstrom-next.conf | 18 +++++++++--------- conf/distro/include/angstrom-uclibc.inc | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/conf/distro/angstrom-next.conf b/conf/distro/angstrom-next.conf index 675bcaf..30c5e42 100644 --- a/conf/distro/angstrom-next.conf +++ b/conf/distro/angstrom-next.conf @@ -54,7 +54,7 @@ FEED_BASEPATH = "feeds/core/${ANGSTROM_PKG_FORMAT}/${TCLIBC}/" LINUX_LIBC_HEADERS_VERSION ?= "3.4%" PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}" -PREFERRED_VERSION_linux-libc-headers-nativesdk = "${LINUX_LIBC_HEADERS_VERSION}" +PREFERRED_VERSION_nativesdk-linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}" ANGSTROM_EGLIBC_VERSION ?= "2.16" @@ -62,13 +62,13 @@ ANGSTROM_UCLIBC_VERSION ?= "0.9.33+git%" PREFERRED_VERSION_uclibc ?= "${ANGSTROM_UCLIBC_VERSION}" PREFERRED_VERSION_uclibc-initial ?= "${ANGSTROM_UCLIBC_VERSION}" -PREFERRED_VERSION_uclibc-nativesdk ?= "${ANGSTROM_UCLIBC_VERSION}" -PREFERRED_VERSION_uclibc-initial-nativesdk ?= "${ANGSTROM_UCLIBC_VERSION}" +PREFERRED_VERSION_nativesdk-uclibc ?= "${ANGSTROM_UCLIBC_VERSION}" +PREFERRED_VERSION_nativesdk-uclibc-initial ?= "${ANGSTROM_UCLIBC_VERSION}" PREFERRED_VERSION_eglibc ?= "${ANGSTROM_EGLIBC_VERSION}" PREFERRED_VERSION_eglibc-initial ?= "${ANGSTROM_EGLIBC_VERSION}" -PREFERRED_VERSION_eglibc-nativesdk ?= "${ANGSTROM_EGLIBC_VERSION}" -PREFERRED_VERSION_eglibc-initial-nativesdk ?= "${ANGSTROM_EGLIBC_VERSION}" +PREFERRED_VERSION_nativesdk-eglibc ?= "${ANGSTROM_EGLIBC_VERSION}" +PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${ANGSTROM_EGLIBC_VERSION}" PREFERRED_VERSION_eglibc-locale ?= "${ANGSTROM_EGLIBC_VERSION}" PREFERRED_VERSION_cross-localedef-native ?= "${ANGSTROM_EGLIBC_VERSION}" @@ -98,9 +98,9 @@ PREFERRED_VERSION_gcc-crosssdk ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-crosssdk-initial ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-runtime ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-runtime-nativesdk ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_libgcc ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_libgcc-nativesdk ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_nativesdk-libgcc ?= "${ANGSTROM_GCC_VERSION}" #avr32 only has patches for binutils 2.17 in OE PREFERRED_VERSION_binutils_avr32 = "2.17" @@ -185,6 +185,6 @@ SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", " DISTRO_FEATURES += "${LDISGOLD}" #LDISGOLD_arm = "ld-is-gold" -LDISGOLD_x86 = "ld-is-gold" -LDISGOLD_x86_64 = "ld-is-gold" +#LDISGOLD_x86 = "ld-is-gold" +#LDISGOLD_x86_64 = "ld-is-gold" LDISGOLD = "" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 660ce5f..a17e8c2 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -12,11 +12,11 @@ PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" PREFERRED_PROVIDER_virtual/gettext_avr32 = "proxy-libintl" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -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" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-nativesdk = "eglibc-nativesdk" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/libiconv-nativesdk = "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/libc-nativesdk = "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "nativesdk-eglibc-initial" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-nativesdk = "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "nativesdk-eglibc" # libc settings DISTRO_FEATURES += "${@['', ' nls'][bb.data.getVar('ENABLE_BINARY_LOCALE_GENERATION', d, 1) == '1']}" # FIXME: We enable IPv4 per default to avoid alot of breakage. -- 1.7.9.5 _______________________________________________ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel