[oe-commits] [openembedded-core] 02/12: toolchain-shar-relocate.sh: Add error-handling

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit c9982dab4cfdd5963d2c2dd4aab99dd6a27fcd1c
Author: Mariano Lopez <mariano.lopez at linux.intel.com>
AuthorDate: Wed Sep 21 07:54:25 2016 +0000

    toolchain-shar-relocate.sh: Add error-handling
    
    The relocation script of the SDK doesn't have enough
    error handling when replacing host perl with SDK perl
    or changing the symlinks. This will add those checks
    along with a sanity check of xargs.
    
    [YOCTO #10114]
    
    Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/files/toolchain-shar-relocate.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh
index d4bcf0e..e491153 100644
--- a/meta/files/toolchain-shar-relocate.sh
+++ b/meta/files/toolchain-shar-relocate.sh
@@ -1,3 +1,8 @@
+if ! xargs --version > /dev/null 2>&1; then
+	echo "xargs is required by the relocation script, please install it firts. Abort!"
+	exit 1
+fi
+
 # fix dynamic loader paths in all ELF SDK binaries
 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 -name "ld-linux*")
@@ -7,6 +12,10 @@ if [ "$dl_path" = "" ] ; then
 fi
 executable_files=$($SUDO_EXEC find $native_sysroot -type f \
 	\( -perm -0100 -o -perm -0010 -o -perm -0001 \) -printf "'%h/%f' ")
+if [ "x$executable_files" = "x" ]; then
+   echo "SDK relocate failed, could not get executalbe files"
+   exit 1
+fi
 
 tdir=`mktemp -d`
 if [ x$tdir = x ] ; then
@@ -14,7 +23,7 @@ if [ x$tdir = x ] ; then
    exit 1
 fi
 cat <<EOF >> $tdir/relocate_sdk.sh
-#!/bin/bash
+#!/bin/sh
 for py in python python2 python3
 do
 	PYTHON=\`which \${py} 2>/dev/null\`
@@ -53,9 +62,18 @@ done | xargs -n100 file | grep ":.*\(ASCII\|script\|source\).*text" | \
         -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" \
         -e "s: /usr/bin/perl: /usr/bin/env perl:g"
 
+if [ $? -ne 0 ]; then
+	echo "Failed to replace perl. Relocate script failed. Abort!"
+	exit 1
+fi
+
 # change all symlinks pointing to @SDKPATH@
 for l in $($SUDO_EXEC find $native_sysroot -type l); do
 	$SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
+	if [ $? -ne 0 ]; then
+		echo "Failed to setup symlinks. Relocate script failed. Abort!"
+		exit 1
+    fi
 done
 
 echo done

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.