* [PATCH] toolchain-scripts: preserve host path in environment setup script
@ 2018-04-19 5:46 Chin Huat Ang
2018-04-19 10:29 ` Burton, Ross
2018-04-19 12:11 ` Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Chin Huat Ang @ 2018-04-19 5:46 UTC (permalink / raw)
To: openembedded-core
The environment setup script generated in the build directory has host paths
filtered, sourcing this script will break runqemu as it requires host
/bin/stty. To resolve this, the script generation now sets the PATH variable
to include the original values obtain from BB_ORIGENV.
[YOCTO #12695]
Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
---
meta/classes/toolchain-scripts.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index eeb320d..75f76d9 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 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${PATH}' >> $script
+ echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${@d.getVar("BB_ORIGENV", False).getVar("PATH", False)}' >> $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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] toolchain-scripts: preserve host path in environment setup script
2018-04-19 5:46 [PATCH] toolchain-scripts: preserve host path in environment setup script Chin Huat Ang
@ 2018-04-19 10:29 ` Burton, Ross
2018-04-19 12:11 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Burton, Ross @ 2018-04-19 10:29 UTC (permalink / raw)
To: Chin Huat Ang; +Cc: OE-core
That would mean that the environment script has the *build system*
PATH on, when the intention here is to extend the *users* PATH.
The solution here would be to do:
echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:$PATH' >> $script
Bitbake only expands ${FOO} and not $FOO, so $PATH won't be expended
until the user runs the script.
Ross
On 19 April 2018 at 06:46, Chin Huat Ang <chin.huat.ang@intel.com> wrote:
> The environment setup script generated in the build directory has host paths
> filtered, sourcing this script will break runqemu as it requires host
> /bin/stty. To resolve this, the script generation now sets the PATH variable
> to include the original values obtain from BB_ORIGENV.
>
> [YOCTO #12695]
>
> Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
> ---
> meta/classes/toolchain-scripts.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
> index eeb320d..75f76d9 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 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${PATH}' >> $script
> + echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${@d.getVar("BB_ORIGENV", False).getVar("PATH", False)}' >> $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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] toolchain-scripts: preserve host path in environment setup script
2018-04-19 5:46 [PATCH] toolchain-scripts: preserve host path in environment setup script Chin Huat Ang
2018-04-19 10:29 ` Burton, Ross
@ 2018-04-19 12:11 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2018-04-19 12:11 UTC (permalink / raw)
To: Chin Huat Ang, openembedded-core
On Thu, 2018-04-19 at 13:46 +0800, Chin Huat Ang wrote:
> The environment setup script generated in the build directory has host paths
> filtered, sourcing this script will break runqemu as it requires host
> /bin/stty. To resolve this, the script generation now sets the PATH variable
> to include the original values obtain from BB_ORIGENV.
>
> [YOCTO #12695]
>
> Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
> ---
> meta/classes/toolchain-scripts.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
> index eeb320d..75f76d9 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 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${PATH}' >> $script
> + echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${@d.getVar("BB_ORIGENV", False).getVar("PATH", False)}' >> $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
Hi,
Could you test something like this please?:
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index eeb320d15a8..1f6d1aa2bf4 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:$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
Cheers,
Richard
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-19 12:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-19 5:46 [PATCH] toolchain-scripts: preserve host path in environment setup script Chin Huat Ang
2018-04-19 10:29 ` Burton, Ross
2018-04-19 12:11 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.