diff options
| author | Joshua Watt <jpewhacker@gmail.com> | 2018-02-12 10:52:07 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-15 13:24:10 +0000 |
| commit | 93ec145f421a45077b40ae99ee6a96bc11f91f18 (patch) | |
| tree | b620ba6f358ef7c11d71fc1199b5b70a427bffee | |
| parent | 0a5bbad5810b69fa09dbd8d886e4f368310a5db9 (diff) | |
| download | openembedded-core-93ec145f421a45077b40ae99ee6a96bc11f91f18.tar.gz openembedded-core-93ec145f421a45077b40ae99ee6a96bc11f91f18.tar.bz2 openembedded-core-93ec145f421a45077b40ae99ee6a96bc11f91f18.zip | |
toolchain-shar-extract: Add post-relocate scripts
Recipes can now install post-relocation scripts which will be run when
the SDK is installed.
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 15 | ||||
| -rw-r--r-- | meta/files/toolchain-shar-extract.sh | 8 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 9bcfe708c7..eeb320d15a 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -116,6 +116,21 @@ fi EOF } +toolchain_create_post_relocate_script() { + script=$1 + rm -f $script + touch $script + + cat >> $script <<EOF +if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then + for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*.sh; do + \$s "\$1" + done + rm -rf "${SDKPATHNATIVE}/post-relocate-setup.d" +fi +EOF +} + #we get the cached site config in the runtime TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d)}" TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 91804ec281..f7ab43066f 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -259,6 +259,14 @@ if [ $savescripts = 0 ] ; then $SUDO_EXEC rm -f ${env_setup_script%/*}/relocate_sdk.py ${env_setup_script%/*}/relocate_sdk.sh fi +# Execute post-relocation script +post_relocate="$target_sdk_dir/post-relocate-setup.sh" +if [ -e "$post_relocate" ]; then + $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $post_relocate + $SUDO_EXEC /bin/sh $post_relocate "$target_sdk_dir" "@SDKPATH@" + $SUDO_EXEC rm -f $post_relocate +fi + echo "SDK has been successfully set up and is ready to be used." echo "Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g." for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 29da121a3a..09f757a087 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -55,6 +55,8 @@ 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 } do_install() { |