diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-03 18:54:46 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 09:54:48 +0100 |
| commit | dceca6d34071b4cbef9e28bbf19dc12f5d925525 (patch) | |
| tree | 0b58ce13262e129a6f3c176c2e14a7e8ab0b5dd3 /meta/classes/toolchain-scripts.bbclass | |
| parent | a64a144096c0637387244b89ed22f4b5352b2522 (diff) | |
| download | openembedded-core-contrib-dceca6d34071b4cbef9e28bbf19dc12f5d925525.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 2 |
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 () { script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} rm -f $script touch $script - echo ". ${COREBASE}/oe-init-build-env ${TOPDIR}" >> $script + echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR}; cd $orig' >> $script echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script |