X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Frstrip.sh;h=55caefc1a8cf463edb73b58d6de1e4ae376e14a7;hp=09a2f9f5515d735f0af283d26d6abdd4efe90c01;hb=f21f8376e99606b470e7d3b1edf0a71e5500b6f6;hpb=60c1f0f64d23003a19a07d6b9638542130f6641d

diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index 09a2f9f551..55caefc1a8 100755
--- a/scripts/rstrip.sh
+++ b/scripts/rstrip.sh
@@ -5,8 +5,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
-
 SELF=${0##*/}
 
 [ -z "$STRIP" ] && {
@@ -23,13 +21,29 @@ TARGETS=$*
 }
 
 find $TARGETS -type f -a -exec file {} \; | \
-  sed -n -e 's/^\(.*\):.*ELF.*\(executable\|relocatable\|shared object\).*,.* stripped/\1:\2/p' | \
+  sed -n -e 's/^\(.*\):.*ELF.*\(executable\|relocatable\|shared object\).*,.*/\1:\2/p' | \
 (
   IFS=":"
   while read F S; do
-    echo "$SELF: $F:$S"
-	[ "${F##*\.}" = "o" -o "${F##*\.}" = "ko" ] && \
-		eval "$STRIP_KMOD $F" || \
+    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
+	}
   done
+  true
 )