summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-17 14:11:21 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-17 22:22:53 +0100
commit046ae6a38d829048663fe1afb1f67de1fbe2e3b5 (patch)
treeafbd7a0ea3d30dc35bf5f2c23ed717594769846e
parent6024456d595dc1ea7421c7dd725982a5d524393f (diff)
downloadpoky-046ae6a38d829048663fe1afb1f67de1fbe2e3b5.tar.gz
poky/moblin: Update SDKPATH and SDK_NAME to use SDK_ARCH and remove pointless path addition
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-moblin/conf/distro/moblin.conf4
-rw-r--r--meta/conf/distro/poky.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
index 1d5fe795ca..5efba45b7f 100644
--- a/meta-moblin/conf/distro/moblin.conf
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -52,8 +52,8 @@ require conf/distro/include/poky-${POKYMODE}.inc
52POKYLIBC ?= "glibc" 52POKYLIBC ?= "glibc"
53require conf/distro/include/poky-${POKYLIBC}.inc 53require conf/distro/include/poky-${POKYLIBC}.inc
54 54
55SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}" 55SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
56SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" 56SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
57 57
58CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" 58CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
59 59
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index a89132f6a3..ab74cfc44c 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -58,8 +58,8 @@ require conf/distro/include/poky-${POKYMODE}.inc
58POKYLIBC ?= "glibc" 58POKYLIBC ?= "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}-${SDK_ARCH}-${TARGET_ARCH}"
62SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}" 62SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
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