diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-09-25 15:40:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-26 16:37:56 +0100 |
commit | d7e22e5f20816e8b285268d58d5506e933556e37 (patch) | |
tree | b7453a81402afb0250126dfb7dac2015fb2d19ec /meta/recipes-devtools/installer/adt-installer/scripts | |
parent | 1ffa203dd5cfc8c1b717ff3c7222eb3f0c21f5d5 (diff) | |
download | poky-d7e22e5f20816e8b285268d58d5506e933556e37.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]
(From OE-Core rev: 0623a0e1bd7cf0c405a0469e9f16779971c0c3b5)
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')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 4 |
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") | |||
195 | 195 | ||
196 | # We don't change the script in-place since we may want the user to re-run | 196 | # We don't change the script in-place since we may want the user to re-run |
197 | # adt-installer script | 197 | # adt-installer script |
198 | $SUDO sh -c "sed -e '"s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:"' scripts/relocate_sdk.py > scripts/relocate_sdk_tmp.py" | 198 | sed -e "s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:" scripts/relocate_sdk.py > scripts/relocate_sdk_tmp.py |
199 | $SUDO chmod +x scripts/relocate_sdk_tmp.py | 199 | chmod +x scripts/relocate_sdk_tmp.py |
200 | 200 | ||
201 | dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") | 201 | dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") |
202 | executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm /111) | 202 | executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm /111) |