From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/conf/distro/include/arago-prefs.inc | 17 ++++++++++++++++-
.../conf/distro/include/toolchain-linaro.inc | 2 --
.../conf/distro/include/tcmode-external-arago.inc | 5 ++---
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc
b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index d5176fd..3bd0622 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -1,3 +1,19 @@
+# Set *target* toolchain preferences at global distro level.
+# Cross and SDK toolchain preferences are set in toolchain-*.inc files
+GCCVERSION ?= "4.7%"
+BINUVERSION ?= "2.23%"
+EGLIBCVERSION ?= "2.17%"
+LINUXLIBCVERSION ?= "3.8%"
+
+PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
+PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
+PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
+PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
+PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}"
+PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}"
+PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}"
+
# Set preferred Qt5 versions. Different namespace from Qt4, so no conflict
include conf/distro/include/qt5-versions.inc
@@ -12,7 +28,6 @@ PREFERRED_PROVIDER_qt4-embedded = "${ARAGO_QT_PROVIDER}"
PREFERRED_VERSION_qt4-embedded = "4.8.4"
PREFERRED_VERSION_qt4-native = "4.8.4"
PREFERRED_VERSION_nativesdk-qt4-tools = "4.8.4"
-PREFERRED_VERSION_linux-libc-headers = "3.8"
# Use v4.09.00.01 of the Graphics SDK
PREFERRED_VERSION_omap3-sgx-modules_omap3 = "4.09.00.01"
diff --git a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
index cc12f08..08aa3f6 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
@@ -32,7 +32,6 @@ SDKGCCVERSION ?= "4.7%"
SDKBINUVERSION ?= "2.23%"
SDKEGLIBCVERSION ?= "2.17%"
SDKLINUXLIBCVERSION ?= "3.8%"
-LINUXLIBCVERSION ?= "3.8%"
PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
@@ -40,7 +39,6 @@ PREFERRED_VERSION_gcc-crosssdk-intermediate ?=
"${SDKGCCVERSION}"
PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_binutils-crosssdk ?= "${SDKBINUVERSION}"
-PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${SDKLINUXLIBCVERSION}"
PREFERRED_VERSION_nativesdk-eglibc ?= "${SDKEGLIBCVERSION}"
PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${SDKEGLIBCVERSION}"
diff --git a/meta-arago-extras/conf/distro/include/tcmode-external-arago.inc
b/meta-arago-extras/conf/distro/include/tcmode-external-arago.inc
index 3ff235f..676e08e 100644
--- a/meta-arago-extras/conf/distro/include/tcmode-external-arago.inc
+++ b/meta-arago-extras/conf/distro/include/tcmode-external-arago.inc
@@ -38,7 +38,7 @@ GCCVERSION ?= "4.5%"
SDKGCCVERSION ?= "4.5%"
BINUVERSION ?= "2.20%"
EGLIBCVERSION ?= "2.12%"
-LINUXLIBCVERSION ?= "3.8"
+SDKLINUXLIBCVERSION ?= "3.8"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
@@ -56,8 +56,7 @@ PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}"
PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?=
"${BINUVERSION}"
-PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
-PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}"
+PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${SDKLINUXLIBCVERSION}"
PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}"
PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}"
PREFERRED_VERSION_nativesdk-eglibc ?= "${EGLIBCVERSION}"
--
1.8.3.2
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
