sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Laurentiu Palcu 2014-01-17 17:16:18 +02:00 committed by Richard Purdie
parent e9fae95f30
commit 1b0d621f32
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-devtools/installer/adt-installer/adt_installer
View File

@ -55,7 +55,7 @@ usage ()
echo_info "# Your rootfs image(s) and target sysroot selections from adt_installer.conf"
echo_info "##############################################################################"
prompt=1
for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do
for arch_type in $YOCTOADT_TARGETS; do
download_images $arch_type $prompt
done
echo_info "############################################################################\n"
@ -403,7 +403,7 @@ else
override_oldfile=0
fi
for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do
for arch_type in $YOCTOADT_TARGETS; do
download_images $arch_type
done

24
meta/recipes-devtools/installer/adt-installer/adt_installer.conf
View File

@ -58,18 +58,18 @@ YOCTOADT_TARGET_MACHINE_x86="qemux86"
YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86"
#Here's some template of other arches, which you need to change the value in ""
#YOCTOADT_ROOTFS_x86_64="sato-sdk"
#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk"
#YOCTOADT_TARGET_MACHINE_x86_64="qemux86-64"
#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86_64"
YOCTOADT_ROOTFS_x86_64="sato-sdk"
YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk"
YOCTOADT_TARGET_MACHINE_x86_64="qemux86-64"
YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86_64"
#YOCTOADT_ROOTFS_ppc="sato-sdk"
#YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk"
#YOCTOADT_TARGET_MACHINE_ppc="qemuppc"
#YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_ppc"
YOCTOADT_ROOTFS_ppc="sato-sdk"
YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk"
YOCTOADT_TARGET_MACHINE_ppc="qemuppc"
YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_ppc"
#YOCTOADT_ROOTFS_mips="sato-sdk"
#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk"
#YOCTOADT_TARGET_MACHINE_mips="qemumips"
#YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_mips"
YOCTOADT_ROOTFS_mips="sato-sdk"
YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk"
YOCTOADT_TARGET_MACHINE_mips="qemumips"
YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_mips"

2
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
View File

@ -292,7 +292,7 @@ user_inst_type=$1
install_native_sdk $user_inst_type
check_result
for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do
for arch_type in $YOCTOADT_TARGETS; do
install_target $arch_type
check_result
done