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.conf | |
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.conf')
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer/adt_installer.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf index cc54acda19..9329a8d199 100644 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf | |||
@@ -51,11 +51,11 @@ YOCTOADT_TARGET_MACHINE_arm="qemuarm" | |||
51 | YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_arm" | 51 | YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_arm" |
52 | 52 | ||
53 | 53 | ||
54 | #Here's another example for setting up target arch of x86, by uncommenting it will trigger the installer to download and setup 2 sysroot environment for 2 target arches: arm and x86. If you want to add more target arch support, you can append more entries by following these samples | 54 | #Here's a template for setting up target arch of x86 |
55 | #YOCTOADT_ROOTFS_x86="sato-sdk" | 55 | YOCTOADT_ROOTFS_x86="sato-sdk" |
56 | #YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk" | 56 | YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk" |
57 | #YOCTOADT_TARGET_MACHINE_x86="qemux86" | 57 | YOCTOADT_TARGET_MACHINE_x86="qemux86" |
58 | #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86" | 58 | YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86" |
59 | 59 | ||
60 | #Here's some template of other arches, which you need to change the value in "" | 60 | #Here's some template of other arches, which you need to change the value in "" |
61 | #YOCTOADT_ROOTFS_x86_64="sato-sdk" | 61 | #YOCTOADT_ROOTFS_x86_64="sato-sdk" |