[zeus/master[PATCH] meta-toolchain-arago: toolchain_env_script: append subscripts

[zeus/master[PATCH] meta-toolchain-arago: toolchain_env_script: append subscripts

[Jacob Stiffler]

* Append environment subscripts to devkit environment
* This allows cmake projects to build against the devkit without
  further configuration.
* Borrowed from oe-core's toolchain-scripts.bbclass

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 .../recipes-core/meta/meta-toolchain-arago.bb           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
index 065531e..1a082ba 100644
--- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
+++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
@@ -69,6 +69,23 @@ toolchain_create_sdk_env_script () {
 	echo 'export OECORE_ACLOCAL_OPTS="-I $SDK_PATH_NATIVE/usr/share/aclocal"' >> $script
 	echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 	echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
+
+        # Borrowed from oe-core/meta/classes/toolchain-scripts.bbclass
+	cat >> $script <<EOF
+
+# Append environment subscripts
+if [ -d "\$OECORE_TARGET_SYSROOT/environment-setup.d" ]; then
+    for envfile in \$OECORE_TARGET_SYSROOT/environment-setup.d/*.sh; do
+	    . \$envfile
+    done
+fi
+if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then
+    for envfile in \$OECORE_NATIVE_SYSROOT/environment-setup.d/*.sh; do
+	    . \$envfile
+    done
+fi
+EOF
+
 }
 
 SDK_POSTPROCESS_COMMAND_prepend = "arago_sdk_fixup; "
-- 
2.7.4

Re: [zeus/master[PATCH] meta-toolchain-arago: toolchain_env_script: append subscripts

[Jacob Stiffler]

Ping.

On 4/2/2020 1:09 PM, Jacob Stiffler wrote:
> * Append environment subscripts to devkit environment
> * This allows cmake projects to build against the devkit without
>    further configuration.
> * Borrowed from oe-core's toolchain-scripts.bbclass
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>   .../recipes-core/meta/meta-toolchain-arago.bb           | 17 +++++++++++++++++
>   1 file changed, 17 insertions(+)
>
> diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
> index 065531e..1a082ba 100644
> --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
> +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb
> @@ -69,6 +69,23 @@ toolchain_create_sdk_env_script () {
>   	echo 'export OECORE_ACLOCAL_OPTS="-I $SDK_PATH_NATIVE/usr/share/aclocal"' >> $script
>   	echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
>   	echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
> +
> +        # Borrowed from oe-core/meta/classes/toolchain-scripts.bbclass
> +	cat >> $script <<EOF
> +
> +# Append environment subscripts
> +if [ -d "\$OECORE_TARGET_SYSROOT/environment-setup.d" ]; then
> +    for envfile in \$OECORE_TARGET_SYSROOT/environment-setup.d/*.sh; do
> +	    . \$envfile
> +    done
> +fi
> +if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then
> +    for envfile in \$OECORE_NATIVE_SYSROOT/environment-setup.d/*.sh; do
> +	    . \$envfile
> +    done
> +fi
> +EOF
> +
>   }
>   
>   SDK_POSTPROCESS_COMMAND_prepend = "arago_sdk_fixup; "