summaryrefslogtreecommitdiffstats
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)
downloadpoky-13438101436699a3f4adc23f7d87e3c37c3b0322.tar.gz
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 38df66eb4d..8067798000 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -2,8 +2,6 @@
2# or indirectly via dependency. No need to be in 'world'. 2# or indirectly via dependency. No need to be in 'world'.
3EXCLUDE_FROM_WORLD = "1" 3EXCLUDE_FROM_WORLD = "1"
4 4
5SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
6
7OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} 5OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
8PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" 6PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
9 7
@@ -18,7 +16,7 @@ CFLAGS = "${BUILD_CFLAGS}"
18CXXFLAGS = "${BUILD_CFLAGS}" 16CXXFLAGS = "${BUILD_CFLAGS}"
19LDFLAGS = "${BUILD_LDFLAGS}" 17LDFLAGS = "${BUILD_LDFLAGS}"
20 18
21prefix = "/usr/local/${SDK_NAME}" 19prefix = "${SDK_PREFIX}"
22exec_prefix = "${prefix}" 20exec_prefix = "${prefix}"
23base_prefix = "${exec_prefix}" 21base_prefix = "${exec_prefix}"
24 22
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 296f2c9abd..f75e7c59de 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -180,6 +180,9 @@ DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
180DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" 180DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
181DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" 181DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
182 182
183SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
184SDK_PREFIX = "/usr/local/${SDK_NAME}"
185
183################################################################## 186##################################################################
184# Kernel info. 187# Kernel info.
185################################################################## 188##################################################################
diff --git a/meta/conf/external_toolchain.conf b/meta/conf/external_toolchain.conf
index 6a1b8e71b9..3856fe1ca6 100644
--- a/meta/conf/external_toolchain.conf
+++ b/meta/conf/external_toolchain.conf
@@ -1,6 +1,6 @@
1TARGET_VENDOR = "-poky" 1TARGET_VENDOR = "-poky"
2 2
3EXTERNAL_TOOLCHAIN = "/usr/local/poky/${TARGET_ARCH}" 3EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}"
4 4
5PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:" 5PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:"
6 6