summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-10 17:58:36 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-10 17:58:36 +0100
commit846794c17e88ae9d7a79bdebf31c0ab31474c22a (patch)
tree1a21afbef4a8dbce599c430d63ce43a5d060156c /meta/conf
parentd6719550db330dd3d9c77a597dba29ff052aed8e (diff)
downloadpoky-846794c17e88ae9d7a79bdebf31c0ab31474c22a.tar.gz
bitbake.conf: Rename SDK_PREFIX SDKPATH
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/distro/include/poky-external.inc2
-rw-r--r--meta/conf/distro/poky.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 59aa2efea2..b48b129fff 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -292,7 +292,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
292PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}" 292PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
293 293
294SDK_NAME = "${DISTRO}/${TARGET_ARCH}" 294SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
295SDK_PREFIX = "/usr/local/${SDK_NAME}" 295SDKPATH = "/usr/local/${SDK_NAME}"
296 296
297################################################################## 297##################################################################
298# Kernel info. 298# Kernel info.
diff --git a/meta/conf/distro/include/poky-external.inc b/meta/conf/distro/include/poky-external.inc
index 8c6d967f2d..e3212c712d 100644
--- a/meta/conf/distro/include/poky-external.inc
+++ b/meta/conf/distro/include/poky-external.inc
@@ -4,7 +4,7 @@
4 4
5TARGET_VENDOR = "-poky" 5TARGET_VENDOR = "-poky"
6 6
7EXTERNAL_TOOLCHAIN = "${SDK_PREFIX}" 7EXTERNAL_TOOLCHAIN = "${SDKPATH}"
8 8
9PATH =. "${EXTERNAL_TOOLCHAIN}/bin:" 9PATH =. "${EXTERNAL_TOOLCHAIN}/bin:"
10 10
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d8c29582d4..a89132f6a3 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -59,7 +59,7 @@ POKYLIBC ?= "glibc"
59require conf/distro/include/poky-${POKYLIBC}.inc 59require conf/distro/include/poky-${POKYLIBC}.inc
60 60
61SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${BUILD_ARCH}-${TARGET_ARCH}" 61SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${BUILD_ARCH}-${TARGET_ARCH}"
62SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" 62SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
63 63
64CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 64CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
65 65