summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-06-27 14:13:23 +0000
committerRichard Purdie <richard@openedhand.com>2007-06-27 14:13:23 +0000
commit13438101436699a3f4adc23f7d87e3c37c3b0322 (patch)
tree1e400285aa8c11fd49288b21c07f643b709a11ba
parent569253545164f1fa0349f6f862abdffdd9627371 (diff)
downloadopenembedded-core-13438101436699a3f4adc23f7d87e3c37c3b0322.tar.gz
openembedded-core-13438101436699a3f4adc23f7d87e3c37c3b0322.tar.bz2
openembedded-core-13438101436699a3f4adc23f7d87e3c37c3b0322.tar.xz
openembedded-core-13438101436699a3f4adc23f7d87e3c37c3b0322.zip
bitbake.conf: Move SDK_NAME and SDK_PREFIX into bitbake.conf
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2035 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/sdk.bbclass4
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/external_toolchain.conf2
3 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 38df66eb4..806779800 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -2,8 +2,6 @@
# or indirectly via dependency. No need to be in 'world'.
EXCLUDE_FROM_WORLD = "1"
-SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
-
OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
@@ -18,7 +16,7 @@ CFLAGS = "${BUILD_CFLAGS}"
CXXFLAGS = "${BUILD_CFLAGS}"
LDFLAGS = "${BUILD_LDFLAGS}"
-prefix = "/usr/local/${SDK_NAME}"
+prefix = "${SDK_PREFIX}"
exec_prefix = "${prefix}"
base_prefix = "${exec_prefix}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 296f2c9ab..f75e7c59d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -180,6 +180,9 @@ DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
+SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
+SDK_PREFIX = "/usr/local/${SDK_NAME}"
+
##################################################################
# Kernel info.
##################################################################
diff --git a/meta/conf/external_toolchain.conf b/meta/conf/external_toolchain.conf
index 6a1b8e71b..3856fe1ca 100644
--- a/meta/conf/external_toolchain.conf
+++ b/meta/conf/external_toolchain.conf
@@ -1,6 +1,6 @@
TARGET_VENDOR = "-poky"
-EXTERNAL_TOOLCHAIN = "/usr/local/poky/${TARGET_ARCH}"
+EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}"
PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:"