diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-05-09 16:23:48 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-05-17 22:44:52 +0900 |
| commit | 5a144a1acd0b4b4afd1b2695f7231b58e8848ce6 (patch) | |
| tree | 070f7a33c17b243a3a562f9e33a67d1d9c875841 /scripts/depmod.sh | |
| parent | 534c9f2ec4c92adbe8791125e7ba66d5023ad51f (diff) | |
| download | lwn-5a144a1acd0b4b4afd1b2695f7231b58e8848ce6.tar.gz lwn-5a144a1acd0b4b4afd1b2695f7231b58e8848ce6.zip | |
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/depmod.sh')
| -rwxr-xr-x | scripts/depmod.sh | 25 |
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 @@ # # A depmod wrapper used by the toplevel Makefile -if test $# -ne 3; then - echo "Usage: $0 /sbin/depmod <kernelrelease> <symbolprefix>" >&2 +if test $# -ne 2; then + echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2 exit 1 fi DEPMOD=$1 KERNELRELEASE=$2 -SYMBOL_PREFIX=$3 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 -n "$SYMBOL_PREFIX"; 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=$(printf '%s\n' "$version" "3.13" | sort -V | tail -n 1) - if test "$later" != "$version"; then - # module-init-tools < 3.13, drop the symbol prefix - SYMBOL_PREFIX="" - fi - fi - if test -n "$SYMBOL_PREFIX"; then - SYMBOL_PREFIX="-P $SYMBOL_PREFIX" - 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 @@ -55,7 +36,7 @@ set -- -ae -F System.map if test -n "$INSTALL_MOD_PATH"; then set -- "$@" -b "$INSTALL_MOD_PATH" fi -"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX +"$DEPMOD" "$@" "$KERNELRELEASE" ret=$? if $depmod_hack_needed; then |