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>
This commit is contained in:
Родитель
9b58b9281d
Коммит
8937e89718
2
Makefile
2
Makefile
|
@ -1396,7 +1396,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files))
|
||||||
# Run depmod only if we have System.map and depmod is executable
|
# Run depmod only if we have System.map and depmod is executable
|
||||||
quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
|
quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
|
||||||
cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
|
cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
|
||||||
$(KERNELRELEASE)
|
$(KERNELRELEASE) "$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))"
|
||||||
|
|
||||||
# Create temporary dir for module support files
|
# Create temporary dir for module support files
|
||||||
# clean it up only when building all modules
|
# clean it up only when building all modules
|
||||||
|
|
|
@ -2,16 +2,36 @@
|
||||||
#
|
#
|
||||||
# A depmod wrapper used by the toplevel Makefile
|
# A depmod wrapper used by the toplevel Makefile
|
||||||
|
|
||||||
if test $# -ne 2; then
|
if test $# -ne 3; then
|
||||||
echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
|
echo "Usage: $0 /sbin/depmod <kernelrelease> <symbolprefix>" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
DEPMOD=$1
|
DEPMOD=$1
|
||||||
KERNELRELEASE=$2
|
KERNELRELEASE=$2
|
||||||
|
SYMBOL_PREFIX=$3
|
||||||
|
|
||||||
if ! test -r System.map -a -x "$DEPMOD"; then
|
if ! test -r System.map -a -x "$DEPMOD"; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
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
|
# older versions of depmod require the version string to start with three
|
||||||
# numbers, so we cheat with a symlink here
|
# numbers, so we cheat with a symlink here
|
||||||
depmod_hack_needed=true
|
depmod_hack_needed=true
|
||||||
|
@ -34,7 +54,7 @@ set -- -ae -F System.map
|
||||||
if test -n "$INSTALL_MOD_PATH"; then
|
if test -n "$INSTALL_MOD_PATH"; then
|
||||||
set -- "$@" -b "$INSTALL_MOD_PATH"
|
set -- "$@" -b "$INSTALL_MOD_PATH"
|
||||||
fi
|
fi
|
||||||
"$DEPMOD" "$@" "$KERNELRELEASE"
|
"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX
|
||||||
ret=$?
|
ret=$?
|
||||||
|
|
||||||
if $depmod_hack_needed; then
|
if $depmod_hack_needed; then
|
||||||
|
|
Загрузка…
Ссылка в новой задаче