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

Commit 934193a6 authored by Randy Dunlap's avatar Randy Dunlap Committed by Masahiro Yamada
Browse files

kbuild: verify that $DEPMOD is installed 

Verify that 'depmod' ($DEPMOD) is installed.
This is a partial revert of commit 620c231c
("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: default avatarRandy 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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent c417fbce

Documentation/process/changes.rst

+7 −12
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ binutils 2.20 ld -v 
flex                   2.5.35           flex --version

bison                  2.0              bison --version

util-linux             2.10o            fdformat --version

module-init-tools      0.9.10           depmod -V

kmod                   13               depmod -V

e2fsprogs              1.41.4           e2fsck -V

jfsutils               1.1.3            fsck.jfs -V

reiserfsprogs          3.6.3            reiserfsck -V
@@ -156,12 +156,6 @@ is not build with ``CONFIG_KALLSYMS`` and you have no way to rebuild and 
reproduce the Oops with that option, then you can still decode that Oops

with ksymoops.



Module-Init-Tools

-----------------



A new module loader is now in the kernel that requires ``module-init-tools``

to use.  It is backward compatible with the 2.4.x series kernels.



Mkinitrd

--------
@@ -371,16 +365,17 @@ Util-linux 


- <https://www.kernel.org/pub/linux/utils/util-linux/>



Kmod

----



- <https://www.kernel.org/pub/linux/utils/kernel/kmod/>

- <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>



Ksymoops

--------



- <https://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>



Module-Init-Tools

-----------------



- <https://www.kernel.org/pub/linux/utils/kernel/module-init-tools/>



Mkinitrd

--------

scripts/depmod.sh

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