cross-canadian: Move binaries into a subdirectory of bin to allow multimachine installs and update users accordingly

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

1 files changed, 5 insertions, 5 deletions

diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index fad9a3406a..a53569b55b 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -73,19 +73,19 @@ do_populate_sdk() {
         rm -f ${SDK_OUTPUT}/${SDKPATHNATIVE}${libdir_nativesdk}/*.la
 
         # Setup site file for external use
-        siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${TARGET_SYS}
+        siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS}
         touch $siteconfig
         for sitefile in ${CONFIG_SITE} ; do
                 cat $sitefile >> $siteconfig
         done
 
         # Create environment setup script
-        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${TARGET_SYS}
+        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${MULTIMACH_TARGET_SYS}
         touch $script
-        echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script
+        echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${MULTIMACH_TARGET_SYS}:$PATH' >> $script
         echo 'export PKG_CONFIG_SYSROOT_DIR=${SDKTARGETSYSROOT}' >> $script
         echo 'export PKG_CONFIG_PATH=${SDKTARGETSYSROOT}${libdir}/pkgconfig' >> $script
-        echo 'export CONFIG_SITE=${SDKPATH}/site-config-${TARGET_SYS}' >> $script
+        echo 'export CONFIG_SITE=${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS}' >> $script
         echo 'export CC=${TARGET_PREFIX}gcc' >> $script
         echo 'export CXX=${TARGET_PREFIX}g++' >> $script
         echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script
@@ -102,7 +102,7 @@ do_populate_sdk() {
         echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ${SDKTARGETSYSROOT}${sysconfdir}/opkg.conf -o ${SDKTARGETSYSROOT}'" >> $script
 
         # Add version information
-        versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${TARGET_SYS}
+        versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${MULTIMACH_TARGET_SYS}
         touch $versionfile
         echo 'Distro: ${DISTRO}' >> $versionfile
         echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile