X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Frstrip.sh;h=4e4232db60d6b67689c70ca36568d7790b006714;hp=e42caa53a296f5e4245d5228711f93831141600f;hb=949cfbb24374be151e2c01db09dd98bc8537a989;hpb=54d622a81572a18927c4bb907dd41fde6ff358c8

diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index e42caa53a2..4e4232db60 100755
--- a/scripts/rstrip.sh
+++ b/scripts/rstrip.sh
@@ -5,25 +5,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
-find_modparams() {
-	FILE="$1"
-	$NM "$FILE" | awk '
-BEGIN {
-	FS=" "
-}
-($3 ~ /^__module_parm_/) && ($3 !~ /^__module_parm_desc/) {
-	gsub(/__module_parm_/, "", $3)
-	printf "-K " $3 " "
-}
-($2 ~ /r/) && ($3 ~ /__param_/) {
-	gsub(/__param_/, "", $3)
-	printf "-K " $3 " "
-}
-'
-}
-
-
 SELF=${0##*/}
 
 [ -z "$STRIP" ] && {
@@ -44,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 -w -K '__param*' -K '__mod*' $(find_modparams "$F")$F"
+		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