diff options
author | James Hogan <james.hogan@imgtec.com> | 2013-02-06 07:56:59 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2013-02-22 05:52:31 -0500 |
commit | 8937e897181a411f73faf4da83c452c7b0732929 (patch) | |
tree | 0d95332bedd56cb3072632474a5a579177dce4b1 /scripts | |
parent | 9b58b9281d296d8e679e394d2aa5a02102dd8fe8 (diff) |
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>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/depmod.sh | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/scripts/depmod.sh b/scripts/depmod.sh index 2ae481703141..122599b1c13b 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh | |||
@@ -2,16 +2,36 @@ | |||
2 | # | 2 | # |
3 | # A depmod wrapper used by the toplevel Makefile | 3 | # A depmod wrapper used by the toplevel Makefile |
4 | 4 | ||
5 | if test $# -ne 2; then | 5 | if test $# -ne 3; then |
6 | echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2 | 6 | echo "Usage: $0 /sbin/depmod <kernelrelease> <symbolprefix>" >&2 |
7 | exit 1 | 7 | exit 1 |
8 | fi | 8 | fi |
9 | DEPMOD=$1 | 9 | DEPMOD=$1 |
10 | KERNELRELEASE=$2 | 10 | KERNELRELEASE=$2 |
11 | SYMBOL_PREFIX=$3 | ||
11 | 12 | ||
12 | if ! test -r System.map -a -x "$DEPMOD"; then | 13 | if ! test -r System.map -a -x "$DEPMOD"; then |
13 | exit 0 | 14 | exit 0 |
14 | fi | 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 | # older versions of depmod require the version string to start with three | 35 | # older versions of depmod require the version string to start with three |
16 | # numbers, so we cheat with a symlink here | 36 | # numbers, so we cheat with a symlink here |
17 | depmod_hack_needed=true | 37 | depmod_hack_needed=true |
@@ -34,7 +54,7 @@ set -- -ae -F System.map | |||
34 | if test -n "$INSTALL_MOD_PATH"; then | 54 | if test -n "$INSTALL_MOD_PATH"; then |
35 | set -- "$@" -b "$INSTALL_MOD_PATH" | 55 | set -- "$@" -b "$INSTALL_MOD_PATH" |
36 | fi | 56 | fi |
37 | "$DEPMOD" "$@" "$KERNELRELEASE" | 57 | "$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX |
38 | ret=$? | 58 | ret=$? |
39 | 59 | ||
40 | if $depmod_hack_needed; then | 60 | if $depmod_hack_needed; then |