summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-07-30 17:40:48 +0300
committerSaul Wold <sgw@linux.intel.com>2013-08-01 21:57:53 -0700
commit1abf13cb035fa9e02f0c6a1c6f3524b649d2a701 (patch)
treecbf3f27f590456fb6617dad85a5f58413b98e803
parent18e4d014bea3a5748f42e6dac648fa9b02230344 (diff)
downloadopenembedded-core-1abf13cb035fa9e02f0c6a1c6f3524b649d2a701.tar.gz
openembedded-core-1abf13cb035fa9e02f0c6a1c6f3524b649d2a701.tar.bz2
openembedded-core-1abf13cb035fa9e02f0c6a1c6f3524b649d2a701.zip
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] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer4
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
2 files changed, 6 insertions, 0 deletions
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"