2 files changed, 20 insertions, 9 deletions

diff --git a/meta-vitis-tc/files/toolchain-shar-extract.sh b/meta-vitis-tc/files/toolchain-shar-extract.sh
index ec2008c8..a04d9046 100644
--- a/meta-vitis-tc/files/toolchain-shar-extract.sh
+++ b/meta-vitis-tc/files/toolchain-shar-extract.sh
@@ -169,7 +169,9 @@ else
 fi
 
 # limit the length for target_sdk_dir, ensure the relocation behaviour in relocate_sdk.py has right result.
-if [ ${#target_sdk_dir} -gt 2048 ]; then
+# This is due to ELF interpreter being set to 'a'*1024 in
+# meta/recipes-core/meta/uninative-tarball.bb
+if [ ${#target_sdk_dir} -gt 1024 ]; then
         echo "Error: The target directory path is too long!!!"
         exit 1
 fi
diff --git a/meta-vitis-tc/files/toolchain-shar-relocate.sh b/meta-vitis-tc/files/toolchain-shar-relocate.sh
index 0c396e6d..9e07bbda 100644
--- a/meta-vitis-tc/files/toolchain-shar-relocate.sh
+++ b/meta-vitis-tc/files/toolchain-shar-relocate.sh
@@ -1,11 +1,14 @@
-if ! xargs --version > /dev/null 2>&1; then
-        echo "xargs is required by the relocation script, please install it first. Abort!"
-        exit 1
-fi
+for cmd in xargs file; do
+        if ! command -v $cmd > /dev/null 2>&1; then
+                echo "The command '$cmd' is required by the relocation script, please install it first. Abort!"
+                exit 1
+        fi
+done
 
 # fix dynamic loader paths in all ELF SDK binaries
+# allow symlinks to be accessed via the find command too
 native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"')
-dl_path=$($SUDO_EXEC find $native_sysroot/lib -maxdepth 1 -name "ld-linux*")
+dl_path=$($SUDO_EXEC find $native_sysroot/lib/ -maxdepth 1 -name "ld-linux*")
 if [ "$dl_path" = "" ] ; then
         echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!"
         exit 1
@@ -51,13 +54,19 @@ if [ $relocate = 1 -o $relocate = 2 ] ; then
         fi
 fi
 if [ $relocate = 2 ] ; then
-        $SUDO_EXEC ${PYTHON} ${env_setup_script%/*}/relocate-wrapper.py $target_sdk_dir > relocate.log 2>&1
+        tdir=`mktemp -d`
+        if [ x$tdir = x ] ; then
+                echo "SDK relocate failed, could not create a temporary directory"
+                exit 1
+        fi
+        $SUDO_EXEC ${PYTHON} ${env_setup_script%/*}/relocate-wrapper.py $target_sdk_dir > $tdir/relocate.log 2>&1
         if [ $? -ne 0 ]; then
-                cat relocate.log
+                cat $tdir/relocate.log
                 echo "SDK could not be set up. Runtime-Relocate script failed. Abort!"
+                rm -rf $tdir
                 exit 1
         fi
-        rm -f relocate.log
+        rm -rf $tdir
 
         for env_setup_scripts in `ls $target_sdk_dir/environment-setup-*`; do
                 cat << EOF > ${env_setup_scripts}.new