[PATCH v3] toolchain-scripts: preserve host path in environment setup script

[PATCH v3] toolchain-scripts: preserve host path in environment setup script

[Chin Huat Ang]

The environment setup script generated in the build directory sets the PATH
variable by expanding ${PATH} which would have host paths filtered. Sourcing
this script to run runqemu will not work as it complains host stty (/bin/stty)
cannot be found.

To resolve this, the script no longer expands ${PATH} during generation time,
instead it will now source oe-init-build-env to initialize the build
environment so that all host paths will be preserved. Also be sure to prepend
STAGING_BINDIR_TOOLCHAIN to the PATH variable so that the toolchain from the
build directory can be found.

[YOCTO #12695]

Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
---
 meta/classes/toolchain-scripts.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index eeb320d..ee411dd 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -62,7 +62,8 @@ toolchain_create_tree_env_script () {
 	script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
 	rm -f $script
 	touch $script
-	echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${PATH}' >> $script
+	echo ". ${COREBASE}/oe-init-build-env ${TOPDIR}" >> $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
 	echo 'export CONFIG_SITE="${@siteinfo_get_files(d)}"' >> $script
-- 
2.7.4

Re: [PATCH v3] toolchain-scripts: preserve host path in environment setup script

[Richard Purdie]

On Wed, 2018-04-25 at 16:00 +0800, Chin Huat Ang wrote:
> The environment setup script generated in the build directory sets
> the PATH
> variable by expanding ${PATH} which would have host paths filtered.
> Sourcing
> this script to run runqemu will not work as it complains host stty
> (/bin/stty)
> cannot be found.
> 
> To resolve this, the script no longer expands ${PATH} during
> generation time,
> instead it will now source oe-init-build-env to initialize the build
> environment so that all host paths will be preserved. Also be sure to
> prepend
> STAGING_BINDIR_TOOLCHAIN to the PATH variable so that the toolchain
> from the
> build directory can be found.
> 
> [YOCTO #12695]
> 
> Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
> ---
>  meta/classes/toolchain-scripts.bbclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

This didn't work as expected on machines which have /bin/sh pointing to
dash, the oe-selftests showed failures.

I've added a followup patch which addresses that problem which allowed
me to merge the patches.

Cheers,

Richard