summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-05-09 03:23:48 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-05-17 09:44:52 -0400
commit5a144a1acd0b4b4afd1b2695f7231b58e8848ce6 (patch)
tree070f7a33c17b243a3a562f9e33a67d1d9c875841 /scripts
parent534c9f2ec4c92adbe8791125e7ba66d5023ad51f (diff)
depmod.sh: remove symbol prefix support
CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit 4ba66a976072 ("arch: remove blackfin port"), commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX, hence the last argument of scripts/depmod.sh can be removed. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/depmod.sh25
1 files changed, 3 insertions, 22 deletions
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 9831cca31240..1a6f85e0e6e1 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -3,36 +3,17 @@
3# 3#
4# A depmod wrapper used by the toplevel Makefile 4# A depmod wrapper used by the toplevel Makefile
5 5
6if test $# -ne 3; then 6if test $# -ne 2; then
7 echo "Usage: $0 /sbin/depmod <kernelrelease> <symbolprefix>" >&2 7 echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
8 exit 1 8 exit 1
9fi 9fi
10DEPMOD=$1 10DEPMOD=$1
11KERNELRELEASE=$2 11KERNELRELEASE=$2
12SYMBOL_PREFIX=$3
13 12
14if ! test -r System.map -a -x "$DEPMOD"; then 13if ! test -r System.map -a -x "$DEPMOD"; then
15 exit 0 14 exit 0
16fi 15fi
17 16
18# older versions of depmod don't support -P <symbol-prefix>
19# support was added in module-init-tools 3.13
20if test -n "$SYMBOL_PREFIX"; then
21 release=$("$DEPMOD" --version)
22 package=$(echo "$release" | cut -d' ' -f 1)
23 if test "$package" = "module-init-tools"; then
24 version=$(echo "$release" | cut -d' ' -f 2)
25 later=$(printf '%s\n' "$version" "3.13" | sort -V | tail -n 1)
26 if test "$later" != "$version"; then
27 # module-init-tools < 3.13, drop the symbol prefix
28 SYMBOL_PREFIX=""
29 fi
30 fi
31 if test -n "$SYMBOL_PREFIX"; then
32 SYMBOL_PREFIX="-P $SYMBOL_PREFIX"
33 fi
34fi
35
36# older versions of depmod require the version string to start with three 17# older versions of depmod require the version string to start with three
37# numbers, so we cheat with a symlink here 18# numbers, so we cheat with a symlink here
38depmod_hack_needed=true 19depmod_hack_needed=true
@@ -55,7 +36,7 @@ set -- -ae -F System.map
55if test -n "$INSTALL_MOD_PATH"; then 36if test -n "$INSTALL_MOD_PATH"; then
56 set -- "$@" -b "$INSTALL_MOD_PATH" 37 set -- "$@" -b "$INSTALL_MOD_PATH"
57fi 38fi
58"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX 39"$DEPMOD" "$@" "$KERNELRELEASE"
59ret=$? 40ret=$?
60 41
61if $depmod_hack_needed; then 42if $depmod_hack_needed; then