ar71xx: cap324: Use standard eth as static lan

[openwrt/openwrt.git] / scripts / rstrip.sh

diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index 5efc866524b8dd63dcc23a50f92383c29f1c8ed6..55caefc1a8cf463edb73b58d6de1e4ae376e14a7 100755 (executable)
--- 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" ] && {
@@ -40,15 +21,28 @@ 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"
+    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
        }
   done
   true