From 2efe776ab082723fe94e91ae7d45e65480bb3faa Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 10 Feb 2015 15:48:48 +0000 Subject: [PATCH] scripts: extend rstrip.sh to remove bad rpaths Remove all rpath entries which do not point to a location below /lib or /usr/lib and which do not begin with '$ORIGIN'. Signed-off-by: Jo-Philipp Wich SVN-Revision: 44377 --- rules.mk | 1 + scripts/rstrip.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/rules.mk b/rules.mk index 949bfb27e8..a79e20dfa4 100644 --- a/rules.mk +++ b/rules.mk @@ -269,6 +269,7 @@ else NM="$(TARGET_CROSS)nm" \ STRIP="$(STRIP)" \ STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \ + PATCHELF="$(STAGING_DIR_HOST)/bin/patchelf" \ $(SCRIPT_DIR)/rstrip.sh endif diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index 4665ff5559..4e4232db60 100755 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -25,11 +25,21 @@ find $TARGETS -type f -a -exec file {} \; | \ ( IFS=":" while read F S; do - echo "$SELF: $F:$S" + echo "$SELF: $F: $S" [ "${S}" = "relocatable" ] && { eval "$STRIP_KMOD $F" } || { b=$(stat -c '%a' $F) + [ -z "$PATCHELF" ] || [ -z "$TOPDIR" ] || { + old_rpath="$($PATCHELF --print-rpath $F)"; new_rpath="" + for path in $old_rpath; do + case "$path" in + /lib/[^/]*|/usr/lib/[^/]*|\$ORIGIN/*) new_rpath="${new_rpath:+$new_rpath:}$path" ;; + *) echo "$SELF: $F: removing rpath $path" ;; + esac + done + [ "$new_rpath" = "$old_rpath" ] || $PATCHELF --set-rpath "$new_rpath" $F + } eval "$STRIP $F" a=$(stat -c '%a' $F) [ "$a" = "$b" ] || chmod $b $F