[oe-commits] Laurentiu Palcu : adt_installer: allow specifying relative target sysroot paths

git at git.openembedded.org git at git.openembedded.org
Sat Aug 3 09:23:48 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 1abf13cb035fa9e02f0c6a1c6f3524b649d2a701
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1abf13cb035fa9e02f0c6a1c6f3524b649d2a701

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Tue Jul 30 17:40:48 2013 +0300

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 at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../installer/adt-installer/adt_installer          |    4 ++++
 .../adt-installer/scripts/adt_installer_internal   |    2 ++
 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 58728af..a6042b9 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 7931ff5..462199c 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"



More information about the Openembedded-commits mailing list