From ccf25acde6daf3b234414f716f25ef66cc333da1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Aug 2007 11:31:51 +0000 Subject: poky.conf: Move all toolchain configuration into the POKYMODE files git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2251 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/include/poky-eabi.inc | 5 +++++ meta/conf/distro/include/poky-eabi2.inc | 5 +++++ meta/conf/distro/include/poky-eabi3.inc | 5 +++++ meta/conf/distro/include/poky-eabi5.inc | 5 +++++ meta/conf/distro/include/poky-oabi.inc | 10 ++++++++-- meta/conf/distro/poky.conf | 9 +++------ 6 files changed, 31 insertions(+), 8 deletions(-) (limited to 'meta') diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index a61d364ad..43f4d71e1 100644 --- a/meta/conf/distro/include/poky-eabi.inc +++ b/meta/conf/distro/include/poky-eabi.inc @@ -2,8 +2,13 @@ # Poky configuration to use EABI # +TARGET_VENDOR = "-poky" + PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" PREFERRED_VERSION_gcc ?= "4.1.2" PREFERRED_VERSION_gcc-cross ?= "4.1.2" diff --git a/meta/conf/distro/include/poky-eabi2.inc b/meta/conf/distro/include/poky-eabi2.inc index c3094bb7f..e25685ba5 100644 --- a/meta/conf/distro/include/poky-eabi2.inc +++ b/meta/conf/distro/include/poky-eabi2.inc @@ -2,8 +2,13 @@ # Poky configuration to use EABI # +TARGET_VENDOR = "-poky" + PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" diff --git a/meta/conf/distro/include/poky-eabi3.inc b/meta/conf/distro/include/poky-eabi3.inc index 128d53e39..106e5db76 100644 --- a/meta/conf/distro/include/poky-eabi3.inc +++ b/meta/conf/distro/include/poky-eabi3.inc @@ -2,8 +2,13 @@ # Poky configuration to use EABI # +TARGET_VENDOR = "-poky" + PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" PREFERRED_VERSION_gcc ?= "4.1.0+csl-arm-2006q1-6" PREFERRED_VERSION_gcc-cross ?= "4.1.0+csl-arm-2006q1-6" diff --git a/meta/conf/distro/include/poky-eabi5.inc b/meta/conf/distro/include/poky-eabi5.inc index 74972ad82..50064878c 100644 --- a/meta/conf/distro/include/poky-eabi5.inc +++ b/meta/conf/distro/include/poky-eabi5.inc @@ -2,8 +2,13 @@ # Poky configuration to use EABI # +TARGET_VENDOR = "-poky" + PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3" PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3" diff --git a/meta/conf/distro/include/poky-oabi.inc b/meta/conf/distro/include/poky-oabi.inc index 2244e449c..6fe171995 100644 --- a/meta/conf/distro/include/poky-oabi.inc +++ b/meta/conf/distro/include/poky-oabi.inc @@ -1,6 +1,13 @@ # -# Poky configuration to use its Original ABI +# Poky configuration to use its Original (Old) Softfloat ABI # +TARGET_VENDOR = "-poky" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" + PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" PREFERRED_VERSION_gcc ?= "3.4.4" @@ -8,7 +15,6 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" GLIBCTARGETOS = "linux" UCLIBCTARGETOS = "linux-uclibc" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index b05121365..e512e5218 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -12,7 +12,8 @@ INHERIT += " ${PACKAGE_CLASSES} debian multimachine poky devshell " #INHERIT += " package_deb debian multimachine poky devshell " # For some reason, this doesn't work # TARGET_OS ?= "linux" -TARGET_VENDOR = "-poky" +# TARGET_VENDOR ?= "-poky" +# Set by POKYMODE instead TARGET_OS = "linux" TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" @@ -43,10 +44,6 @@ require conf/distro/include/poky-${POKYLIBC}.inc # # Preferred providers: # -# Toolchain: -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Virtuals: PREFERRED_PROVIDER_virtual/db ?= "db" @@ -121,7 +118,7 @@ SRCDATE_matchbox-applet-light = "20070529" SRCDATE_fstests = "20070529" SRCDATE_abiword ?= "20070130" SRCDATE_xvideo-tests ?= "20070702" -SRCDATE_clutter ?= "20070725" +SRCDATE_clutter ?= "20070727" # # Preferred Versions: -- cgit v1.2.3