From 519a8acdcb2866cd14dc558358abfb9b27983dc2 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 30 Jul 2013 17:40:48 +0300 Subject: adt_installer: allow specifying relative target sysroot paths If one specifies a relative target sysroot path, then he/she must always be in the same directory in order to be able to compile. With this patch, adt_installer will automatically convert user supplied relative paths to absolute. [YOCTO #4955] (From OE-Core rev: 1abf13cb035fa9e02f0c6a1c6f3524b649d2a701) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/installer/adt-installer/adt_installer | 4 ++++ .../installer/adt-installer/scripts/adt_installer_internal | 2 ++ 2 files changed, 6 insertions(+) diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index 58728afd63..a6042b9c2d 100755 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer @@ -272,6 +272,10 @@ download_images() select_sysroot_image=`eval echo $select_sysroot_image_var` select_sysroot=`eval echo $select_sysroot_var` + if [ -n "$select_sysroot" ]; then + select_sysroot=`readlink -m $select_sysroot` + fi + if [ "$select_rootfs" != "" ]; then if [ $2 ]; then #echo_info "\n############################################################################" 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 7931ff5cd9..462199c563 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -242,6 +242,8 @@ target_sysroot=`eval echo $target_sysroot_var` if [ "$target_sysroot" == "" ]; then return 0 +else + target_sysroot=`readlink -m $target_sysroot` fi target_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1" -- cgit v1.2.3-54-g00ecf