summary refs log tree commit diff
path: root/scripts/depmod.sh
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2018-07-01 19:46:06 -0700
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-07-18 01:18:05 +0900
commit934193a654c1f4d0643ddbf4b2529b508cae926e (patch)
tree0bd62686104e242c8c1c31385479664cfb0383e7 /scripts/depmod.sh
parentc417fbce98722ad7e384caa8ba6f2e7c5f8672d9 (diff)
downloadlinux-934193a654c1f4d0643ddbf4b2529b508cae926e.tar.gz
kbuild: verify that $DEPMOD is installed
Verify that 'depmod' ($DEPMOD) is installed.
This is a partial revert of commit 620c231c7a7f
("kbuild: do not check for ancient modutils tools").

Also update Documentation/process/changes.rst to refer to
kmod instead of module-init-tools.

Fixes kernel bugzilla #198965:
https://bugzilla.kernel.org/show_bug.cgi?id=198965

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Lucas De Marchi <lucas.de.marchi@gmail.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Chih-Wei Huang <cwhuang@linux.org.tw>
Cc: stable@vger.kernel.org # any kernel since 2012
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/depmod.sh')
-rwxr-xr-xscripts/depmod.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 1a6f85e0e6e1..999d585eaa73 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -10,10 +10,16 @@ fi
 DEPMOD=$1
 KERNELRELEASE=$2
 
-if ! test -r System.map -a -x "$DEPMOD"; then
+if ! test -r System.map ; then
 	exit 0
 fi
 
+if [ -z $(command -v $DEPMOD) ]; then
+	echo "'make modules_install' requires $DEPMOD. Please install it." >&2
+	echo "This is probably in the kmod package." >&2
+	exit 1
+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