diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-01-17 17:16:18 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-22 07:20:04 +0000 |
| commit | 1b0d621f3278286d74c8113af5ad5c918a5cd5a8 (patch) | |
| tree | b01784676cc937890acc4c6e79a1ac1c2dbcb6bc /meta/recipes-devtools/installer/adt-installer/adt_installer.conf | |
| parent | e9fae95f303165bb1a075cb007f2959e8e1b1c96 (diff) | |
| download | poky-1b0d621f3278286d74c8113af5ad5c918a5cd5a8.tar.gz | |
adt_installer: do not install rootfs if target is not selected
Currently, if YOCTOADT_TARGETS does not contain an architecture but the
rootfs/machine settings are uncommented, then the rootfs is installed
and adt will throw an error because is not able to find the toolchain
environment script.
This patch will:
* not allow to install a target rootfs if the toolchain for the
target architecture is not selected;
* uncomment the target rootfs/machine settings for the other
architectures since it's easier for the user to just add a new
architecture in YOCTOADT_TARGETS and have the target rootfs
installed;
[YOCTO #5727]
(From OE-Core rev: 22351d27de76b39cb71904396e73497e36d9e1d6)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@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 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf index 9329a8d199..867fbd107b 100644 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf | |||
| @@ -58,18 +58,18 @@ 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" |
| 62 | #YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk" | 62 | YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk" |
| 63 | #YOCTOADT_TARGET_MACHINE_x86_64="qemux86-64" | 63 | YOCTOADT_TARGET_MACHINE_x86_64="qemux86-64" |
| 64 | #YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86_64" | 64 | YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86_64" |
| 65 | 65 | ||
| 66 | #YOCTOADT_ROOTFS_ppc="sato-sdk" | 66 | YOCTOADT_ROOTFS_ppc="sato-sdk" |
| 67 | #YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk" | 67 | YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk" |
| 68 | #YOCTOADT_TARGET_MACHINE_ppc="qemuppc" | 68 | YOCTOADT_TARGET_MACHINE_ppc="qemuppc" |
| 69 | #YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_ppc" | 69 | YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_ppc" |
| 70 | 70 | ||
| 71 | #YOCTOADT_ROOTFS_mips="sato-sdk" | 71 | YOCTOADT_ROOTFS_mips="sato-sdk" |
| 72 | #YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk" | 72 | YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk" |
| 73 | #YOCTOADT_TARGET_MACHINE_mips="qemumips" | 73 | YOCTOADT_TARGET_MACHINE_mips="qemumips" |
| 74 | #YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_mips" | 74 | YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_mips" |
| 75 | 75 | ||