From c8999e8cc07641e2e0e1fff0e55c89b19b22bcb4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 16 Jul 2024 08:48:06 -0600 Subject: meta-vitis-tc: Update files/toolchain-share* to latest master versions Minor updates to sync to the latest upstream YP changes. Signed-off-by: Mark Hatle (cherry picked from commit 550e2bc3255a70364ee0fbc4515a1a20f1feb775) Signed-off-by: Mark Hatle --- meta-vitis-tc/files/toolchain-shar-relocate.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'meta-vitis-tc') diff --git a/meta-vitis-tc/files/toolchain-shar-relocate.sh b/meta-vitis-tc/files/toolchain-shar-relocate.sh index 0c396e6d..b7faf090 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 -- cgit v1.2.3-54-g00ecf