Patchwork [1/1] adt_installer: allow specifying relative target sysroot paths

login
register
mail settings
Submitter Laurentiu Palcu
Date July 30, 2013, 2:40 p.m.
Message ID <ed3170be112571814659eee1b6cc8d42d34aae0e.1375195205.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/54801/
State Accepted
Commit 519a8acdcb2866cd14dc558358abfb9b27983dc2
Headers show

Comments

Laurentiu Palcu - July 30, 2013, 2:40 p.m.
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>
---
 .../installer/adt-installer/adt_installer          |    4 ++++
 .../adt-installer/scripts/adt_installer_internal   |    2 ++
 2 files changed, 6 insertions(+)

Patch

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"