summaryrefslogtreecommitdiffstats
path: root/meta/classes/toolchain-scripts.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-03 18:54:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:01 +0100
commitf6689c1dae69fa196266ad5f0a170e49d0b20ae6 (patch)
treeb75d44e7370f0c264fe3ee84a139e6ed3113dee9 /meta/classes/toolchain-scripts.bbclass
parent00302da3991ea7dea298f475091b35b6d73cefe1 (diff)
downloadpoky-f6689c1dae69fa196266ad5f0a170e49d0b20ae6.tar.gz
toolchain-scripts/meta-ide-support: Handle dash shells correctly
Where /bin/sh is dash, the recent toolchain scripts change fails as the $(pwd) usage in oe-init-build-env doesn't function correctly. Fix this by saving and restoring the cwd and calling the script within its own directory. This fixes meta-ide-support on dash based systems. (From OE-Core rev: dceca6d34071b4cbef9e28bbf19dc12f5d925525) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
-rw-r--r--meta/classes/toolchain-scripts.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index ee411ddca0..71da5e5409 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -62,7 +62,7 @@ toolchain_create_tree_env_script () {
62 script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} 62 script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
63 rm -f $script 63 rm -f $script
64 touch $script 64 touch $script
65 echo ". ${COREBASE}/oe-init-build-env ${TOPDIR}" >> $script 65 echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR}; cd $orig' >> $script
66 echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script 66 echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script
67 echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script 67 echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script
68 echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script 68 echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script