summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/populate_sdk_base.bbclass4
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index c15a4d4629..88bcb27757 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -123,7 +123,7 @@ SDK_ARCH=$(echo ${SDK_ARCH} | sed -e "s/i[5-6]86/ix86/")
123 123
124if [ "$INST_ARCH" != "$SDK_ARCH" ]; then 124if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
125 echo "Error: Installation machine not supported!" 125 echo "Error: Installation machine not supported!"
126 exit -1 126 exit 1
127fi 127fi
128 128
129DEFAULT_INSTALL_DIR="${SDKPATH}" 129DEFAULT_INSTALL_DIR="${SDKPATH}"
@@ -233,7 +233,7 @@ if [ $? -ne 0 ]; then
233fi 233fi
234 234
235# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc 235# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc
236$SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|$SUDO_EXEC grep ":.*ASCII.*text"|cut -d':' -f1|$SUDO_EXEC xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" 236$SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep ":.*\(ASCII\|script\).*text"|cut -d':' -f1|$SUDO_EXEC xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
237 237
238# change all symlinks pointing to ${SDKPATH} 238# change all symlinks pointing to ${SDKPATH}
239for l in $($SUDO_EXEC find $native_sysroot -type l); do 239for l in $($SUDO_EXEC find $native_sysroot -type l); do
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 9a1357366b..b80a7ed11d 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -212,7 +212,7 @@ check_result
212env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*") 212env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*")
213$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script 213$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script
214 214
215find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\ 215find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*\(ASCII\|script\).*text"|cut -d':' -f1|\
216 xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" 216 xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g"
217 217
218# change all symlinks pointing to /opt/${DISTRO}/${SDK_VERSION} 218# change all symlinks pointing to /opt/${DISTRO}/${SDK_VERSION}