summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-01 11:31:51 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-01 11:31:51 +0000
commitccf25acde6daf3b234414f716f25ef66cc333da1 (patch)
treecc23dee035e9e66942dc310cf1a4d05835c805a7 /meta
parentef8532ad2ee1d4715755ea8c11410bb656cf7e5a (diff)
downloadpoky-ccf25acde6daf3b234414f716f25ef66cc333da1.tar.gz
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
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-eabi.inc5
-rw-r--r--meta/conf/distro/include/poky-eabi2.inc5
-rw-r--r--meta/conf/distro/include/poky-eabi3.inc5
-rw-r--r--meta/conf/distro/include/poky-eabi5.inc5
-rw-r--r--meta/conf/distro/include/poky-oabi.inc10
-rw-r--r--meta/conf/distro/poky.conf9
6 files changed, 31 insertions, 8 deletions
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index a61d364ad6..43f4d71e15 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -2,8 +2,13 @@
2# Poky configuration to use EABI 2# Poky configuration to use EABI
3# 3#
4 4
5TARGET_VENDOR = "-poky"
6
5PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" 7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
7 12
8PREFERRED_VERSION_gcc ?= "4.1.2" 13PREFERRED_VERSION_gcc ?= "4.1.2"
9PREFERRED_VERSION_gcc-cross ?= "4.1.2" 14PREFERRED_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 c3094bb7f9..e25685ba5e 100644
--- a/meta/conf/distro/include/poky-eabi2.inc
+++ b/meta/conf/distro/include/poky-eabi2.inc
@@ -2,8 +2,13 @@
2# Poky configuration to use EABI 2# Poky configuration to use EABI
3# 3#
4 4
5TARGET_VENDOR = "-poky"
6
5PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" 7PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
6PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" 8PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
7 12
8PREFERRED_VERSION_gcc ?= "4.1.1" 13PREFERRED_VERSION_gcc ?= "4.1.1"
9PREFERRED_VERSION_gcc-cross ?= "4.1.1" 14PREFERRED_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 128d53e39e..106e5db76e 100644
--- a/meta/conf/distro/include/poky-eabi3.inc
+++ b/meta/conf/distro/include/poky-eabi3.inc
@@ -2,8 +2,13 @@
2# Poky configuration to use EABI 2# Poky configuration to use EABI
3# 3#
4 4
5TARGET_VENDOR = "-poky"
6
5PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" 7PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
6PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" 8PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
7 12
8PREFERRED_VERSION_gcc ?= "4.1.0+csl-arm-2006q1-6" 13PREFERRED_VERSION_gcc ?= "4.1.0+csl-arm-2006q1-6"
9PREFERRED_VERSION_gcc-cross ?= "4.1.0+csl-arm-2006q1-6" 14PREFERRED_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 74972ad822..50064878c2 100644
--- a/meta/conf/distro/include/poky-eabi5.inc
+++ b/meta/conf/distro/include/poky-eabi5.inc
@@ -2,8 +2,13 @@
2# Poky configuration to use EABI 2# Poky configuration to use EABI
3# 3#
4 4
5TARGET_VENDOR = "-poky"
6
5PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" 7PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
6PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" 8PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
7 12
8PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3" 13PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3"
9PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3" 14PREFERRED_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 2244e449c7..6fe1719953 100644
--- a/meta/conf/distro/include/poky-oabi.inc
+++ b/meta/conf/distro/include/poky-oabi.inc
@@ -1,6 +1,13 @@
1# 1#
2# Poky configuration to use its Original ABI 2# Poky configuration to use its Original (Old) Softfloat ABI
3# 3#
4TARGET_VENDOR = "-poky"
5
6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
10
4PREFERRED_VERSION_binutils ?= "2.16" 11PREFERRED_VERSION_binutils ?= "2.16"
5PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" 12PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
6PREFERRED_VERSION_gcc ?= "3.4.4" 13PREFERRED_VERSION_gcc ?= "3.4.4"
@@ -8,7 +15,6 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4"
8PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" 15PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
9PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" 16PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
10PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" 17PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
11PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc"
12 18
13GLIBCTARGETOS = "linux" 19GLIBCTARGETOS = "linux"
14UCLIBCTARGETOS = "linux-uclibc" 20UCLIBCTARGETOS = "linux-uclibc"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index b051213655..e512e52184 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -12,7 +12,8 @@ INHERIT += " ${PACKAGE_CLASSES} debian multimachine poky devshell "
12#INHERIT += " package_deb debian multimachine poky devshell " 12#INHERIT += " package_deb debian multimachine poky devshell "
13# For some reason, this doesn't work 13# For some reason, this doesn't work
14# TARGET_OS ?= "linux" 14# TARGET_OS ?= "linux"
15TARGET_VENDOR = "-poky" 15# TARGET_VENDOR ?= "-poky"
16# Set by POKYMODE instead
16TARGET_OS = "linux" 17TARGET_OS = "linux"
17TARGET_FPU_arm ?= "soft" 18TARGET_FPU_arm ?= "soft"
18TARGET_FPU_armeb ?= "soft" 19TARGET_FPU_armeb ?= "soft"
@@ -43,10 +44,6 @@ require conf/distro/include/poky-${POKYLIBC}.inc
43# 44#
44# Preferred providers: 45# Preferred providers:
45# 46#
46# Toolchain:
47PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
48PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
49PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
50 47
51# Virtuals: 48# Virtuals:
52PREFERRED_PROVIDER_virtual/db ?= "db" 49PREFERRED_PROVIDER_virtual/db ?= "db"
@@ -121,7 +118,7 @@ SRCDATE_matchbox-applet-light = "20070529"
121SRCDATE_fstests = "20070529" 118SRCDATE_fstests = "20070529"
122SRCDATE_abiword ?= "20070130" 119SRCDATE_abiword ?= "20070130"
123SRCDATE_xvideo-tests ?= "20070702" 120SRCDATE_xvideo-tests ?= "20070702"
124SRCDATE_clutter ?= "20070725" 121SRCDATE_clutter ?= "20070727"
125 122
126# 123#
127# Preferred Versions: 124# Preferred Versions: