From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 9 Feb 2007 16:24:34 +0000 (+0000)
Subject: more fixes for rstrip.sh and kernel modules - fixes #1301
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=267cc36546d4741ed2b1bf63f6cae18bbfa3b2e2

more fixes for rstrip.sh and kernel modules - fixes #1301

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6280 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/rules.mk b/rules.mk
index b63fcf31c..a6188f4a6 100644
--- a/rules.mk
+++ b/rules.mk
@@ -87,8 +87,9 @@ TARGET_CONFIGURE_OPTS:= \
 
 # strip an entire directory
 RSTRIP:= \
+  NM="$(TARGET_CROSS)nm" \
   STRIP="$(STRIP)" \
-  STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment -w -K '__mod*'" \
+  STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
   $(SCRIPT_DIR)/rstrip.sh
 
 # where to build (and put) .ipk packages
diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index 252522bfa..6dd44f2ed 100755
--- a/scripts/rstrip.sh
+++ b/scripts/rstrip.sh
@@ -6,6 +6,23 @@
 # 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##*/}
 
@@ -28,9 +45,11 @@ find $TARGETS -type f -a -exec file {} \; | \
   IFS=":"
   while read F S; do
     echo "$SELF: $F:$S"
-	[ "${F##*\.}" = "o" -o "${F##*\.}" = "ko" ] && \
-		eval "$STRIP_KMOD $F" || \
+	[ "${F##*\.}" = "o" -o "${F##*\.}" = "ko" ] && {
+		eval "$STRIP_KMOD -w -K '__param*' -K '__mod*' $(find_modparams "$F")$F"
+	} || {
 		eval "$STRIP $F"
+	}
   done
   true
 )