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/adt_installer | |
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/adt_installer')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/adt_installer | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index 76afcf36ed..f3c05185a1 100755 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer | |||
@@ -67,6 +67,10 @@ validate_config() | |||
67 | 67 | ||
68 | for selected_arch_type in $YOCTOADT_TARGETS; do | 68 | for selected_arch_type in $YOCTOADT_TARGETS; do |
69 | found=0 | 69 | found=0 |
70 | select_machine_var="\$YOCTOADT_TARGET_MACHINE_$selected_arch_type" | ||
71 | select_machine=`eval echo $select_machine_var` | ||
72 | show_error_banner=0 | ||
73 | |||
70 | for supported_arch_type in $YOCTOADT_SUPPORTED_TARGETS; do | 74 | for supported_arch_type in $YOCTOADT_SUPPORTED_TARGETS; do |
71 | if [ "$selected_arch_type" == "$supported_arch_type" ]; then | 75 | if [ "$selected_arch_type" == "$supported_arch_type" ]; then |
72 | found=1 | 76 | found=1 |
@@ -75,10 +79,18 @@ validate_config() | |||
75 | done | 79 | done |
76 | if [ $found == 0 ]; then | 80 | if [ $found == 0 ]; then |
77 | echo_info "[ADT_INST] Error: YOCTADT_TARGETS in adt_installer.conf contains invalid entries: $YOCTOADT_TARGETS. Valid values are: $YOCTOADT_SUPPORTED_TARGETS" | 81 | echo_info "[ADT_INST] Error: YOCTADT_TARGETS in adt_installer.conf contains invalid entries: $YOCTOADT_TARGETS. Valid values are: $YOCTOADT_SUPPORTED_TARGETS" |
82 | show_error_banner=1 | ||
83 | elif [ -z "$select_machine" ]; then | ||
84 | echo_info "[ADT_INST] Error: No MACHINE was defined for $selected_arch_type architecture! This is needed to install the toolchain and the correct environment settings." | ||
85 | echo_info "[ADT_INST] To do that, in adt-installer.conf, set the following variable: YOCTOADT_TARGET_MACHINE_$selected_arch_type" | ||
86 | show_error_banner=1 | ||
87 | fi | ||
88 | |||
89 | if [ $show_error_banner == 1 ]; then | ||
78 | echo -e "\n#############################################################################" | 90 | echo -e "\n#############################################################################" |
79 | echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " | 91 | echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " |
80 | echo -e "#############################################################################\n" | 92 | echo -e "#############################################################################\n" |
81 | exit -1 | 93 | exit -1 |
82 | fi | 94 | fi |
83 | done | 95 | done |
84 | 96 | ||