diff options
3 files changed, 12 insertions, 4 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 2bff41f9e6..1b55e70e67 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -126,7 +126,11 @@ if [ "$target_sdk_dir" = "" ]; then | |||
126 | fi | 126 | fi |
127 | 127 | ||
128 | eval target_sdk_dir=$target_sdk_dir | 128 | eval target_sdk_dir=$target_sdk_dir |
129 | target_sdk_dir=$(readlink -m $target_sdk_dir) | 129 | if [ -d $target_sdk_dir ]; then |
130 | target_sdk_dir=$(cd $target_sdk_dir; pwd) | ||
131 | else | ||
132 | target_sdk_dir=$(readlink -m $target_sdk_dir) | ||
133 | fi | ||
130 | 134 | ||
131 | printf "You are about to install Poky SDK to \"$target_sdk_dir\". Proceed[Y/n]?" | 135 | printf "You are about to install Poky SDK to \"$target_sdk_dir\". Proceed[Y/n]?" |
132 | read answer | 136 | read answer |
@@ -154,7 +158,7 @@ echo "done" | |||
154 | 158 | ||
155 | printf "Setting it up..." | 159 | printf "Setting it up..." |
156 | # fix environment paths | 160 | # fix environment paths |
157 | env_setup_script=$(find $target_sdk_dir -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}") | 161 | env_setup_script=$(find $target_sdk_dir/ -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}") |
158 | sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script | 162 | sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script |
159 | 163 | ||
160 | # fix dynamic loader paths in all ELF SDK binaries | 164 | # fix dynamic loader paths in all ELF SDK binaries |
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 | |||
340 | fi | 340 | fi |
341 | 341 | ||
342 | eval INSTALL_FOLDER=$INSTALL_FOLDER | 342 | eval INSTALL_FOLDER=$INSTALL_FOLDER |
343 | export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER) | 343 | if [ -d $INSTALL_FOLDER ]; then |
344 | export INSTALL_FOLDER=$(cd $INSTALL_FOLDER; pwd) | ||
345 | else | ||
346 | export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER) | ||
347 | fi | ||
344 | 348 | ||
345 | clear | 349 | clear |
346 | 350 | ||
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 | |||
207 | check_result | 207 | check_result |
208 | 208 | ||
209 | # replace /opt/${DISTRO}/${SDK_VERSION} with the install folder in all configs | 209 | # replace /opt/${DISTRO}/${SDK_VERSION} with the install folder in all configs |
210 | env_setup_script=$(find $NATIVE_INSTALL_DIR -name "environment-setup-*") | 210 | env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*") |
211 | $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script | 211 | $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script |
212 | 212 | ||
213 | find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\ | 213 | find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\ |