* SDK_PATH was previously dynamically determined by using BASHISMS when environment-setup was sourced. * Relocate_sdk.py is required to be ran and the script knows the location of the toolchain SDK. * By having the relocate_sdk script set SDK_PATH we remove the need for bashisms from environment-setup.
Signed-off-by: Franklin S. Cooper Jr <[email protected]> --- .../meta/meta-toolchain-arago-tisdk.bb | 2 +- .../recipes-core/meta/meta-toolchain-arago-qte.bb | 2 +- .../recipes-core/meta/meta-toolchain-arago.bb | 17 +++++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb index 114ae1c..68df1bf 100644 --- a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb +++ b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb @@ -4,7 +4,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "libgnutls-dev libgnutls-extra26 libgnutls-openssl require recipes-core/meta/meta-toolchain-arago-qte.bb -PR = "r2" +PR = "r3" toolchain_create_sdk_env_script_append() { echo -e 'export PS1="\[\\e[32;1m\][linux-devkit]\[\\e[0m\]:\w> "' >> $script diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb index 136ebca..207df4f 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb @@ -5,7 +5,7 @@ TOOLCHAIN_SUFFIX ?= "-qte-sdk" require meta-toolchain-arago.bb -PR = "r13" +PR = "r14" QT_DIR_NAME = "qtopia" 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 699ada7..7f70c42 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb @@ -7,7 +7,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "" require recipes-core/meta/meta-toolchain.bb -PR = "r23" +PR = "r24" # This function creates an environment-setup-script for use in a deployable SDK toolchain_create_sdk_env_script () { @@ -15,17 +15,7 @@ toolchain_create_sdk_env_script () { script=${SDK_OUTPUT}/${SDKPATH}/environment-setup rm -f $script touch $script - echo 'SDK_PATH="${SDKPATH}"' >> $script - echo 'if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./environment-setup" ]; then' >> $script - echo ' echo "Error: This script needs to be sourced. Please run as \". ./environment-setup\""' >> $script - echo ' exit 1' >> $script - echo 'else' >> $script - echo ' if [ -n "$BASH_SOURCE" ]; then' >> $script - echo ' SDK_PATH="`dirname $BASH_SOURCE`"' >> $script - echo ' fi' >> $script - echo ' SDK_PATH=`readlink -f "$SDK_PATH"`' >> $script - echo ' export SDK_PATH' >> $script - echo 'fi' >> $script + echo 'export SDK_PATH="${SDKPATH}"' >> $script echo 'export SDK_SYS=${SDK_SYS}' >> $script echo 'export TARGET_SYS=${REAL_MULTIMACH_TARGET_SYS}' >> $script echo 'export TOOLCHAIN_SYS=${TOOLCHAIN_SYS}' >> $script @@ -234,6 +224,9 @@ for env_setup_script in `ls $target_sdk_dir/environment-setup*`; do $SUDO_EXEC sed -e "s:$TMPSDKPATH:$target_sdk_dir:g" -i $env_setup_script done +# Correct SDK_PATH since the exact installation path is now known +$SUDO_EXEC sed -i -e "s|export SDK_PATH\=.*|export SDK_PATH=$target_sdk_dir|g" $target_sdk_dir/environment-setup* + # fix dynamic loader paths in all ELF SDK binaries native_sysroot=$target_sdk_dir/sysroots/${SDK_SYS} dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") -- 1.7.0.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
