adt_installer: do not install rootfs if target is not selected

PATCH New Laurentiu Palcu 1 participant 2 messages Jan 17, 2014

lore

Share & tools

lore

Laurentiu Palcu

author

2014-01-17 15:16 UTC #0 lore raw

cover adt_installer: do not install rootfs if target is not selected

The following changes since commit cfd1520b4b492ab27b2900ba3510abe6f288097e:

oe-selftest: separated the SStateBase and SStateTests in different modules (2014-01-16 12:18:52 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib lpalcu/b5727_adt_installer_fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/b5727_adt_installer_fix

Laurentiu Palcu (1):
adt_installer: do not install rootfs if target is not selected

 .../installer/adt-installer/adt_installer          |    4 ++--
 .../installer/adt-installer/adt_installer.conf     |   24 ++++++++++----------
 .../adt-installer/scripts/adt_installer_internal   |    2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

Signature · 1 line

1.7.9.5

Laurentiu Palcu

author

2014-01-17 15:16 UTC #1 lore raw

PATCH 1/1 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]

Signed-off-by Laurentiu Palcu <[email protected]>

---
 .../installer/adt-installer/adt_installer          |    4 ++--
 .../installer/adt-installer/adt_installer.conf     |   24 ++++++++++----------
 .../adt-installer/scripts/adt_installer_internal   |    2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

meta/recipes-devtools/installer/adt-installer/adt_installer +2 -2

index a150de0..1f2d039 100755
@@ -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

meta/recipes-devtools/installer/adt-installer/adt_installer.conf +12 ~~-12~~

index 9329a8d..867fbd1 100644
@@ -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"

meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +1 -1

index 2eb13a9..2fef7b0 100755
@@ -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

Signature · 1 line

1.7.9.5