Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a144a1a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

depmod.sh: remove symbol prefix support 



CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG.
They were removed by commit 4ba66a97 ("arch: remove blackfin port"),
commit bb6fb6df ("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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 534c9f2e

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1760,7 +1760,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files)) 
# 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) "$(patsubst y,_,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))"

                   $(KERNELRELEASE)



# Create temporary dir for module support files

# clean it up only when building all modules

scripts/depmod.sh

+3 −22
Original line number Diff line number Diff line
@@ -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