From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 17 Sep 2009 13:11:21 +0000 (+0100)
Subject: poky/moblin: Update SDKPATH and SDK_NAME to use SDK_ARCH and remove pointless path... 
X-Git-Tag: 2011-1~6986
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=046ae6a38d829048663fe1afb1f67de1fbe2e3b5;p=openembedded-core.git

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>
---

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
 POKYLIBC ?= "glibc"
 require conf/distro/include/poky-${POKYLIBC}.inc
 
-SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}"
-SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
+SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
+SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
 
 CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
 
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
 POKYLIBC ?= "glibc"
 require conf/distro/include/poky-${POKYLIBC}.inc
 
-SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${BUILD_ARCH}-${TARGET_ARCH}"
-SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
+SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
+SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
 
 CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"