meta-toolchain: Improve layout

* Switch from /usr/local/poky to /opt/poky
* Use a sysroots directory for both the "native" sdk binaries and the target
* Drop the meta-toolchain extras packages. These are replaced with packaged-staging.
* Change the nativesdk layout to match our usual filesystem layout
* Clean up various hardcoded prefix references

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9d8e59457c..492ed9678a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -43,6 +43,9 @@ includedir_native = "${prefix_native}/include"
 libdir_native = "${prefix_native}/lib"
 datadir_native = "${prefix_native}/share"
 bindir_cross = "/bin"
+prefix_nativesdk = "/usr"
+bindir_nativesdk = "${prefix_nativesdk}/bin"
+libdir_nativesdk = "${prefix_nativesdk}/lib"
 
 #
 # Cross recipes need to know about the target layout
@@ -290,6 +293,7 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
 SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
 SDKPATH = "/usr/local/${SDK_NAME}"
+SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
 
 ##################################################################
 # Kernel info.
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 57231fd6ef..951e156c25 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}-${SDK_ARCH}-${TARGET_ARCH}"
-SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
+SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
+SDKPATH = "/opt/${DISTRO}"
 
 CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}"