diff options
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 20 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 2 |
2 files changed, 17 insertions, 5 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 779cc3f5e4..0ff5301530 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -118,11 +118,23 @@ EOF } toolchain_create_post_relocate_script() { - script=$1 - rm -f $script - touch $script + relocate_script=$1 + env_dir=$2 + rm -f $relocate_script + touch $relocate_script + + cat >> $relocate_script <<EOF +# Source top-level SDK env scripts in case they are needed for the relocate +# scripts. +for env_setup_script in ${env_dir}/environment-setup-*; do + . \$env_setup_script + status=\$? + if [ \$status != 0 ]; then + echo "\$0: Failed to source \$env_setup_script with status \$status" + exit \$status + fi +done - cat >> $script <<EOF if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*; do if [ ! -x \$s ]; then diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 09f757a087..da1230bead 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -56,7 +56,7 @@ create_sdk_files() { # Add version information toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} - toolchain_create_post_relocate_script ${SDK_OUTPUT}/${SDKPATH}/post-relocate-setup.sh + toolchain_create_post_relocate_script ${SDK_OUTPUT}/${SDKPATH}/post-relocate-setup.sh ${SDKPATH} } do_install() { |