[oe-commits] Laurentiu Palcu : adt_installer: do not install rootfs if target is not selected
git at git.openembedded.org
git at git.openembedded.org
Tue Jan 21 10:50:27 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: fa145f5a9578a0daebe845274c06255bec2944d6
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fa145f5a9578a0daebe845274c06255bec2944d6
Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date: Fri Jan 17 17:16:18 2014 +0200
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 <laurentiu.palcu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../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(-)
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index a150de0..1f2d039 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -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
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index 9329a8d..867fbd1 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"
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"
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 9f4cb39..e3422f5 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
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
More information about the Openembedded-commits
mailing list