summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-09-25 15:40:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-26 16:37:13 +0100
commit0623a0e1bd7cf0c405a0469e9f16779971c0c3b5 (patch)
treea4e28faf80f747d8bf5fa713897a6d6d450fc214 /meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
parent5acfced041477d8c272485196e87ad601a0ce5b4 (diff)
downloadopenembedded-core-0623a0e1bd7cf0c405a0469e9f16779971c0c3b5.tar.gz
adt-installer: add warning if MACHINE is not set in adt-installer.conf
Since the MACHINE can now be specified in adt-installer.conf, in order to install the proper toolchain and environment script for the given machine, add a sanity checking at the beginning to make sure MACHINE is set for the wanted architecture. Also: * uncomment the x86 target variables, in adt-installer.conf, in order to have qemux86 MACHINE set, by default, and also the sysroot installed (since it doesn't make much sense to install the toolchain without a target sysroot); * remove 'sudo' when creating relocate_sdk_tmp.py because the file is created in adt-installer directory; [YOCTO #5259] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal4
1 files changed, 2 insertions, 2 deletions
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 ebfdf2a69b..2eb13a9044 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -195,8 +195,8 @@ escaped_sdkpath=$(echo $DEFAULT_INSTALL_FOLDER |sed -e "s:[\+\.]:\\\\\\\\\0:g")
# We don't change the script in-place since we may want the user to re-run
# adt-installer script
-$SUDO sh -c "sed -e '"s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:"' scripts/relocate_sdk.py > scripts/relocate_sdk_tmp.py"
-$SUDO chmod +x scripts/relocate_sdk_tmp.py
+sed -e "s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:" scripts/relocate_sdk.py > scripts/relocate_sdk_tmp.py
+chmod +x scripts/relocate_sdk_tmp.py
dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*")
executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm /111)