From 009d2a0b7e423b3a5c972d2735588cdc677f4165 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 1 Aug 2007 13:23:41 +0000
Subject: Use POKYMODE to enable the external toolchain

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2285 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 build/conf/local.conf.sample               | 20 ++++++++++----------
 meta/conf/distro/include/poky-external.inc | 25 +++++++++++++++++++++++++
 meta/conf/external_toolchain.conf          | 25 -------------------------
 3 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 meta/conf/distro/include/poky-external.inc
 delete mode 100644 meta/conf/external_toolchain.conf

diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 3c22e0a2f..29ca0174e 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -52,12 +52,16 @@ IMAGE_FEATURES = "tools-dbg tools-profile tools-testapps debug-tweaks"
 #PACKAGE_CLASSES ?= "package_deb package_ipk"
 PACKAGE_CLASSES ?= "package_ipk"
 
-# POKYMODE controls the characteristics of the generated packages/images.
-# Options include several different EABI combinations and a
-# compatibility mode for the OABI mode poky use to use. Use "oabi" for machines 
-# with kernels < 2.6.18 for example. The default is "eabi". These changes only 
-# really apply for ARM machines.
-# POKYMODE = "oabi"
+# POKYMODE controls the characteristics of the generated packages/images by
+# telling poky which type of toolchain to use.
+#
+# Options include several different EABI combinations and a compatibility 
+# mode for the OABI mode poky previously used. 
+#
+# The default is "eabi"
+# Use "oabi" for machines with kernels < 2.6.18 on ARM for example.
+# Use "external" to use the precompiled external poky toolchain.
+# POKYMODE = "external"
 
 # Uncomment this to specify where BitBake should create its temporary files.
 # Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
@@ -96,7 +100,3 @@ BBINCLUDELOGS = "yes"
 CVS_TARBALL_STASH = "http://folks.o-hand.com/~richard/poky/sources/"
 
 ENABLE_BINARY_LOCALE_GENERATION = "1"
-
-# A precompiled poky toolchain is available. If installed, uncomment the 
-# line below to enable (Note this support is still experimental)
-#require conf/external_toolchain.conf
diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc
new file mode 100644
index 000000000..3856fe1ca
--- /dev/null
+++ b/meta/conf/distro/include/poky-external.inc
@@ -0,0 +1,25 @@
+TARGET_VENDOR = "-poky"
+
+EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}"
+
+PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:"
+
+PREFERRED_PROVIDER_linux-libc-headers = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc-initial = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/arm-poky-linux-binutils = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/arm-poky-linux-libc-for-gcc = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/i586-poky-linux-gcc = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/i586-poky-linux-gcc-initial = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/i586-poky-linux-binutils = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/i586-poky-linux-libc-for-gcc = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/libc = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/libintl = "external-poky-toolchain"
+PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain"
+PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain"
+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 "
+
+
diff --git a/meta/conf/external_toolchain.conf b/meta/conf/external_toolchain.conf
deleted file mode 100644
index 3856fe1ca..000000000
--- a/meta/conf/external_toolchain.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-TARGET_VENDOR = "-poky"
-
-EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}"
-
-PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:"
-
-PREFERRED_PROVIDER_linux-libc-headers = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc-initial = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-binutils = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/arm-poky-linux-libc-for-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-gcc-initial = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-binutils = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/i586-poky-linux-libc-for-gcc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/libc = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/libintl = "external-poky-toolchain"
-PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain"
-PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain"
-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 "
-
-
-- 
cgit v1.2.3