diff options
Diffstat (limited to 'meta/recipes-devtools')
| -rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/adt_installer | 6 | ||||
| -rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index 2d252b72ad..0be5a1d607 100755 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer @@ -340,7 +340,11 @@ if [ "$INSTALL_FOLDER" = "" ]; then fi eval INSTALL_FOLDER=$INSTALL_FOLDER -export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER) +if [ -d $INSTALL_FOLDER ]; then + export INSTALL_FOLDER=$(cd $INSTALL_FOLDER; pwd) +else + export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER) +fi clear diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index f113aa4b80..76acaa7e8a 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -207,7 +207,7 @@ $SUDO scripts/relocate_sdk_tmp.py $INSTALL_FOLDER $dl_path $executable_files check_result # replace /opt/${DISTRO}/${SDK_VERSION} with the install folder in all configs -env_setup_script=$(find $NATIVE_INSTALL_DIR -name "environment-setup-*") +env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*") $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\ |