Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 8937e897181a411f73faf4da83c452c7b0732929

Authored by James Hogan
Committed by Michal Marek
1 parent 9b58b9281d
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

depmod: pass -P $CONFIG_SYMBOL_PREFIX 

On architectures which have symbol prefixes, depmod emits lots of
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 for the symbol prefix
(required but may be empty), and update the main Makefile to always pass
"$(CONFIG_SYMBOL_PREFIX)" to scripts/depmod.sh.

If the provided symbol prefix is non-empty, scripts/depmod.sh checks if
depmod --version reports module-init-tools with a version number < 3.13
otherwise it appends -P $SYMBOL_PREFIX to the depmod command line.

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
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 2 changed files with 24 additions and 4 deletions Side-by-side Diff

... ... @@ -1396,7 +1396,7 @@
1396 1396 # Run depmod only if we have System.map and depmod is executable
1397 1397 quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
1398 1398 cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
1399   - $(KERNELRELEASE)
  1399 + $(KERNELRELEASE) "$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))"
1400 1400  
1401 1401 # Create temporary dir for module support files
1402 1402 # clean it up only when building all modules
... ... @@ -2,16 +2,36 @@
2 2 #
3 3 # A depmod wrapper used by the toplevel Makefile
4 4  
5   -if test $# -ne 2; then
6   - echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
  5 +if test $# -ne 3; then
  6 + echo "Usage: $0 /sbin/depmod <kernelrelease> <symbolprefix>" >&2
7 7 exit 1
8 8 fi
9 9 DEPMOD=$1
10 10 KERNELRELEASE=$2
  11 +SYMBOL_PREFIX=$3
11 12  
12 13 if ! test -r System.map -a -x "$DEPMOD"; then
13 14 exit 0
14 15 fi
  16 +
  17 +# older versions of depmod don't support -P <symbol-prefix>
  18 +# support was added in module-init-tools 3.13
  19 +if test -n "$SYMBOL_PREFIX"; then
  20 + release=$("$DEPMOD" --version)
  21 + package=$(echo "$release" | cut -d' ' -f 1)
  22 + if test "$package" = "module-init-tools"; then
  23 + version=$(echo "$release" | cut -d' ' -f 2)
  24 + later=$(printf '%s\n' "$version" "3.13" | sort -V | tail -n 1)
  25 + if test "$later" != "$version"; then
  26 + # module-init-tools < 3.13, drop the symbol prefix
  27 + SYMBOL_PREFIX=""
  28 + fi
  29 + fi
  30 + if test -n "$SYMBOL_PREFIX"; then
  31 + SYMBOL_PREFIX="-P $SYMBOL_PREFIX"
  32 + fi
  33 +fi
  34 +
15 35 # older versions of depmod require the version string to start with three
16 36 # numbers, so we cheat with a symlink here
17 37 depmod_hack_needed=true
... ... @@ -34,7 +54,7 @@
34 54 if test -n "$INSTALL_MOD_PATH"; then
35 55 set -- "$@" -b "$INSTALL_MOD_PATH"
36 56 fi
37   -"$DEPMOD" "$@" "$KERNELRELEASE"
  57 +"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX
38 58 ret=$?
39 59  
40 60 if $depmod_hack_needed; then