summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-07-30 17:40:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:03 +0100
commit519a8acdcb2866cd14dc558358abfb9b27983dc2 (patch)
tree7a1c88e9641972bf5faa5f47d0958fc1beb59841 /meta/recipes-devtools/installer
parentb8962edd6b140178bed87f3a0ceab982264c3a17 (diff)
downloadpoky-519a8acdcb2866cd14dc558358abfb9b27983dc2.tar.gz
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 <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer')
-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()
272 select_sysroot_image=`eval echo $select_sysroot_image_var` 272 select_sysroot_image=`eval echo $select_sysroot_image_var`
273 select_sysroot=`eval echo $select_sysroot_var` 273 select_sysroot=`eval echo $select_sysroot_var`
274 274
275 if [ -n "$select_sysroot" ]; then
276 select_sysroot=`readlink -m $select_sysroot`
277 fi
278
275 if [ "$select_rootfs" != "" ]; then 279 if [ "$select_rootfs" != "" ]; then
276 if [ $2 ]; then 280 if [ $2 ]; then
277 #echo_info "\n############################################################################" 281 #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`
242 242
243if [ "$target_sysroot" == "" ]; then 243if [ "$target_sysroot" == "" ]; then
244 return 0 244 return 0
245else
246 target_sysroot=`readlink -m $target_sysroot`
245fi 247fi
246 248
247target_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1" 249target_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1"