summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-01-17 17:16:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-22 07:20:04 +0000
commit1b0d621f3278286d74c8113af5ad5c918a5cd5a8 (patch)
treeb01784676cc937890acc4c6e79a1ac1c2dbcb6bc /meta
parente9fae95f303165bb1a075cb007f2959e8e1b1c96 (diff)
downloadpoky-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')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer4
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf24
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
3 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index a150de0525..1f2d039598 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -55,7 +55,7 @@ usage ()
55 echo_info "# Your rootfs image(s) and target sysroot selections from adt_installer.conf" 55 echo_info "# Your rootfs image(s) and target sysroot selections from adt_installer.conf"
56 echo_info "##############################################################################" 56 echo_info "##############################################################################"
57prompt=1 57prompt=1
58for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do 58for arch_type in $YOCTOADT_TARGETS; do
59 download_images $arch_type $prompt 59 download_images $arch_type $prompt
60done 60done
61 echo_info "############################################################################\n" 61 echo_info "############################################################################\n"
@@ -403,7 +403,7 @@ else
403 override_oldfile=0 403 override_oldfile=0
404fi 404fi
405 405
406for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do 406for arch_type in $YOCTOADT_TARGETS; do
407 download_images $arch_type 407 download_images $arch_type
408done 408done
409 409
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"
58YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86" 58YOCTOADT_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" 61YOCTOADT_ROOTFS_x86_64="sato-sdk"
62#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk" 62YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk"
63#YOCTOADT_TARGET_MACHINE_x86_64="qemux86-64" 63YOCTOADT_TARGET_MACHINE_x86_64="qemux86-64"
64#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86_64" 64YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86_64"
65 65
66#YOCTOADT_ROOTFS_ppc="sato-sdk" 66YOCTOADT_ROOTFS_ppc="sato-sdk"
67#YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk" 67YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk"
68#YOCTOADT_TARGET_MACHINE_ppc="qemuppc" 68YOCTOADT_TARGET_MACHINE_ppc="qemuppc"
69#YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_ppc" 69YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_ppc"
70 70
71#YOCTOADT_ROOTFS_mips="sato-sdk" 71YOCTOADT_ROOTFS_mips="sato-sdk"
72#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk" 72YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk"
73#YOCTOADT_TARGET_MACHINE_mips="qemumips" 73YOCTOADT_TARGET_MACHINE_mips="qemumips"
74#YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_mips" 74YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_mips"
75 75
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 2eb13a9044..2fef7b0eed 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -292,7 +292,7 @@ user_inst_type=$1
292install_native_sdk $user_inst_type 292install_native_sdk $user_inst_type
293check_result 293check_result
294 294
295for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do 295for arch_type in $YOCTOADT_TARGETS; do
296 install_target $arch_type 296 install_target $arch_type
297 check_result 297 check_result
298done 298done