From c9375e5a1978002e7d588682d1532d58bfd62835 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Sep 2007 08:52:20 +0000 Subject: Cleanup POKYMODE files and add summary documentation git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2722 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/include/poky-eabi-csl2005q3-2.inc | 13 ++++++------ meta/conf/distro/include/poky-eabi.inc | 6 ++---- meta/conf/distro/include/poky-eabi2.inc | 24 ---------------------- meta/conf/distro/include/poky-eabi3.inc | 10 ++++----- meta/conf/distro/include/poky-eabi5.inc | 10 ++++----- meta/conf/distro/include/poky-eabi6.inc | 9 ++++---- .../distro/include/poky-external-csl2006q3.inc | 9 +++++--- meta/conf/distro/include/poky-external.inc | 7 ++++--- meta/conf/distro/include/poky-glibc.inc | 5 ++++- meta/conf/distro/include/poky-oabi.inc | 5 +++-- meta/conf/distro/include/poky-uclibc.inc | 6 ++++-- .../distro/include/preferred-xorg-versions.inc | 4 ++++ meta/conf/distro/poky.conf | 4 ++++ 13 files changed, 49 insertions(+), 63 deletions(-) delete mode 100644 meta/conf/distro/include/poky-eabi2.inc (limited to 'meta/conf') diff --git a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc index 535bfd3d8..aaa1163b7 100644 --- a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc +++ b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc @@ -1,9 +1,12 @@ # -# Poky configuration to use EABI +# Poky configuration to use CSL 2005q3-2 derived toolchain (ARM EABI) # -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}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 ?= "3.4.4+csl-arm-2005q3-2" PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3-2" @@ -15,7 +18,3 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.3.6+csl-arm-2005q3-2" PREFERRED_VERSION_elfutils ?= "0.108" PREFERRED_VERSION_linux-libc-headers ?= "2.6.12rc3+csl-arm-2005q3-2" - -#Use the ARM EABI when building for an ARM cpu. We can't use overrides -#here because this breaks all places where ":=" is used. -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index f61053a1f..32a419bdf 100644 --- a/meta/conf/distro/include/poky-eabi.inc +++ b/meta/conf/distro/include/poky-eabi.inc @@ -1,5 +1,6 @@ # -# Poky configuration to use EABI +# Poky's default configuration (ARM EABI) +# gcc 4.1.2, binutils 2.18, glibc 2.5 # TARGET_VENDOR = "-poky" @@ -20,6 +21,3 @@ PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" PREFERRED_VERSION_glibc-initial ?= "2.5" PREFERRED_VERSION_elfutils ?= "0.108" - -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/meta/conf/distro/include/poky-eabi2.inc b/meta/conf/distro/include/poky-eabi2.inc deleted file mode 100644 index e25685ba5..000000000 --- a/meta/conf/distro/include/poky-eabi2.inc +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.16.91.0.7" -PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" -PREFERRED_VERSION_elfutils ?= "0.108" - -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/meta/conf/distro/include/poky-eabi3.inc b/meta/conf/distro/include/poky-eabi3.inc index 106e5db76..11100175d 100644 --- a/meta/conf/distro/include/poky-eabi3.inc +++ b/meta/conf/distro/include/poky-eabi3.inc @@ -1,11 +1,12 @@ # -# Poky configuration to use EABI +# Poky configuration to use CSL 2006q1-6 derived toolchain (ARM EABI) +# gcc 4.1.0-csl, binutils 2.17-csl, glibc 2.4 # 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}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" @@ -19,6 +20,3 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.4" PREFERRED_VERSION_elfutils ?= "0.108" - -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/meta/conf/distro/include/poky-eabi5.inc b/meta/conf/distro/include/poky-eabi5.inc index 50064878c..112169a71 100644 --- a/meta/conf/distro/include/poky-eabi5.inc +++ b/meta/conf/distro/include/poky-eabi5.inc @@ -1,11 +1,12 @@ # -# Poky configuration to use EABI +# Poky configuration to use CSL 2005q3 derived toolchain (ARM EABI) +# gcc 3.4.4-csl, binutils 2.16.91.0.7, glibc 2.4 # 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}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" @@ -19,6 +20,3 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" PREFERRED_VERSION_glibc ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.4" PREFERRED_VERSION_elfutils ?= "0.108" - -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/meta/conf/distro/include/poky-eabi6.inc b/meta/conf/distro/include/poky-eabi6.inc index 1c120050f..c838ed07b 100644 --- a/meta/conf/distro/include/poky-eabi6.inc +++ b/meta/conf/distro/include/poky-eabi6.inc @@ -1,10 +1,12 @@ # -# Poky configuration to use EABI +# Poky configuration to use CSL 2005q3 derived toolchain (ARM EABI) +# gcc 3.4.4-csl, binutils 2.16.91.0.7, glibc 2.5 # TARGET_VENDOR = "-poky" -PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +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" @@ -19,6 +21,3 @@ PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" PREFERRED_VERSION_glibc-initial ?= "2.5" PREFERRED_VERSION_elfutils ?= "0.108" - -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/meta/conf/distro/include/poky-external-csl2006q3.inc b/meta/conf/distro/include/poky-external-csl2006q3.inc index fa03b9c8d..7bcbe6724 100644 --- a/meta/conf/distro/include/poky-external-csl2006q3.inc +++ b/meta/conf/distro/include/poky-external-csl2006q3.inc @@ -1,3 +1,7 @@ +# +# Poky configuration to use external CSL 2006q3-27 toolchain (ARM EABI) +# + TARGET_VENDOR = "-none" EXTERNAL_TOOLCHAIN = "/usr/local/csl/arm-2006q3" @@ -15,8 +19,7 @@ PREFERRED_PROVIDER_virtual/libiconv = "external-csl-toolchain" PREFERRED_PROVIDER_glibc-thread-db = "external-csl-toolchain" PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-csl-toolchain" +PREFERRED_VERSION_external-csl-toolchain = "2006q3-27" + TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include " TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib " - -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc index 459931e49..d3731ae49 100644 --- a/meta/conf/distro/include/poky-external.inc +++ b/meta/conf/distro/include/poky-external.inc @@ -1,3 +1,7 @@ +# +# Configuration to use a toolchain built by meta-toolchain.bb +# + TARGET_VENDOR = "-poky" EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}" @@ -21,6 +25,3 @@ PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain" TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include " TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib " - -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc index 2744588e1..b76879e9e 100644 --- a/meta/conf/distro/include/poky-glibc.inc +++ b/meta/conf/distro/include/poky-glibc.inc @@ -1,4 +1,7 @@ -# glibc: +# +# glibc specific configuration +# + PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" diff --git a/meta/conf/distro/include/poky-oabi.inc b/meta/conf/distro/include/poky-oabi.inc index b9178b071..b731569b6 100644 --- a/meta/conf/distro/include/poky-oabi.inc +++ b/meta/conf/distro/include/poky-oabi.inc @@ -3,11 +3,11 @@ # TARGET_VENDOR = "-poky" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" +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_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" @@ -16,6 +16,7 @@ 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_VERSION_elfutils ?= "0.89" GLIBCTARGETOS = "linux" UCLIBCTARGETOS = "linux-uclibc" diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/poky-uclibc.inc index 55a8694ae..139cf0780 100644 --- a/meta/conf/distro/include/poky-uclibc.inc +++ b/meta/conf/distro/include/poky-uclibc.inc @@ -1,5 +1,7 @@ -# uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds +# +# uclibc specific configuration +# + PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index c62ef97a4..964b2b22b 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -1,3 +1,7 @@ +# +# The latest Xorg package versions +# + PREFERRED_VERSION_applewmproto = "1.0.3" PREFERRED_VERSION_bigreqsproto = "1.0.2" PREFERRED_VERSION_bigreqsproto-native = "1.0.2" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 27867fccc..e9f958112 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -35,6 +35,10 @@ KERNEL_CONSOLE = "ttyS0" #DEBUG_BUILD = "1" #INHIBIT_PACKAGE_STRIP = "1" +# Default to TARGETOS values for EABI +GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" +UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" + POKYMODE ?= "eabi" require conf/distro/include/poky-${POKYMODE}.inc -- cgit v1.2.3