[PATCH 1/1] depmod: pass -P $CONFIG_SYMBOL_PREFIX

* [PATCH 1/1] depmod: pass -P $CONFIG_SYMBOL_PREFIX
@ 2013-01-31  9:41 ` James Hogan
  0 siblings, 0 replies; 10+ messages in thread
From: James Hogan @ 2013-01-31  9:41 UTC (permalink / raw)
  To: linux-kernel
  Cc: James Hogan, Michal Marek, linux-kbuild, Mike Frysinger,
	Yoshinori Sato, uclinux-dist-devel

On architectures which have symbol prefixes, depmod emits lots of false
warnings like this:

WARNING: $module.ko needs unknown symbol $symbol

This is because depmod isn't being passed the -P <symbol_prefix>
arguments to specify the symbol prefix to ignore. This option is
included since the 3.13 release of module-init-tools.

Update scripts/depmod.sh to take extra arguments which are passed
through directly to depmod, and update the main Makefile to pass
-P $(CONFIG_SYMBOL_PREFIX to scripts/depmod.sh, but only if
CONFIG_SYMBOL_PREFIX is set and non-empty.

scripts/depmod.sh also drops the -P arguments if depmod --version
reports module-init-tools with a version number < 3.13.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: linux-kbuild@vger.kernel.org
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: uclinux-dist-devel@blackfin.uclinux.org
---
My shell-fu isn't great, so all comments for improvements appreciated.

 Makefile          |    6 +++++-
 scripts/depmod.sh |   27 +++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2d3c92c..89e41d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1394,10 +1394,14 @@ quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN   $(wildcard $(rm-dirs)))
 quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN   $(wildcard $(rm-files)))
       cmd_rmfiles = rm -f $(rm-files)
 
+ifneq ($(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX)),)
+  depmod_args = -P $(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))
+endif
+
 # Run depmod only if we have System.map and depmod is executable
 quiet_cmd_depmod = DEPMOD  $(KERNELRELEASE)
       cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
-                   $(KERNELRELEASE)
+                   $(KERNELRELEASE) $(depmod_args)
 
 # Create temporary dir for module support files
 # clean it up only when building all modules
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 2ae4817..4f3747f 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -2,16 +2,35 @@
 #
 # A depmod wrapper used by the toplevel Makefile
 
-if test $# -ne 2; then
-	echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
+if test $# -lt 2; then
+	echo "Usage: $0 /sbin/depmod <kernelrelease> [args]" >&2
 	exit 1
 fi
 DEPMOD=$1
-KERNELRELEASE=$2
+shift
+KERNELRELEASE=$1
+shift
 
 if ! test -r System.map -a -x "$DEPMOD"; then
 	exit 0
 fi
+
+# older versions of depmod don't support -P <symbol-prefix>
+# support was added in module-init-tools 3.13
+if test "$1" = "-P"; then
+	release=$("$DEPMOD" --version)
+	package=$(echo "$release" | cut -d' ' -f 1)
+	if test "$package" = "module-init-tools"; then
+		version=$(echo "$release" | cut -d' ' -f 2)
+		later=$({ echo "$version"; echo "3.13"; } | sort -V | tail -n 1)
+		if test "$later" != "$version"; then
+			# module-init-tools < 3.13, drop the next 2 args
+			shift
+			shift
+		fi
+	fi
+fi
+
 # older versions of depmod require the version string to start with three
 # numbers, so we cheat with a symlink here
 depmod_hack_needed=true
@@ -30,7 +49,7 @@ if $depmod_hack_needed; then
 	KERNELRELEASE=99.98.$KERNELRELEASE
 fi
 
-set -- -ae -F System.map
+set -- -ae -F System.map "$@"
 if test -n "$INSTALL_MOD_PATH"; then
 	set -- "$@" -b "$INSTALL_MOD_PATH"
 fi
-- 
1.7.7.6



^ permalink raw reply related	[flat|nested] 10+ messages in thread