Skip to content

Commit 934193a

Browse files
rddunlapmasahir0y
authored andcommitted
kbuild: verify that $DEPMOD is installed
Verify that 'depmod' ($DEPMOD) is installed. This is a partial revert of commit 620c231 ("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 <[email protected]> Cc: Lucas De Marchi <[email protected]> Cc: Lucas De Marchi <[email protected]> Cc: Michal Marek <[email protected]> Cc: Jessica Yu <[email protected]> Cc: Chih-Wei Huang <[email protected]> Cc: [email protected] # any kernel since 2012 Signed-off-by: Masahiro Yamada <[email protected]>
1 parent c417fbc commit 934193a

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

Documentation/process/changes.rst

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ binutils 2.20 ld -v
3535
flex 2.5.35 flex --version
3636
bison 2.0 bison --version
3737
util-linux 2.10o fdformat --version
38-
module-init-tools 0.9.10 depmod -V
38+
kmod 13 depmod -V
3939
e2fsprogs 1.41.4 e2fsck -V
4040
jfsutils 1.1.3 fsck.jfs -V
4141
reiserfsprogs 3.6.3 reiserfsck -V
@@ -156,12 +156,6 @@ is not build with ``CONFIG_KALLSYMS`` and you have no way to rebuild and
156156
reproduce the Oops with that option, then you can still decode that Oops
157157
with ksymoops.
158158

159-
Module-Init-Tools
160-
-----------------
161-
162-
A new module loader is now in the kernel that requires ``module-init-tools``
163-
to use. It is backward compatible with the 2.4.x series kernels.
164-
165159
Mkinitrd
166160
--------
167161

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

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

368+
Kmod
369+
----
370+
371+
- <https://www.kernel.org/pub/linux/utils/kernel/kmod/>
372+
- <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>
373+
374374
Ksymoops
375375
--------
376376

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

379-
Module-Init-Tools
380-
-----------------
381-
382-
- <https://www.kernel.org/pub/linux/utils/kernel/module-init-tools/>
383-
384379
Mkinitrd
385380
--------
386381

scripts/depmod.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,16 @@ fi
1010
DEPMOD=$1
1111
KERNELRELEASE=$2
1212

13-
if ! test -r System.map -a -x "$DEPMOD"; then
13+
if ! test -r System.map ; then
1414
exit 0
1515
fi
1616

17+
if [ -z $(command -v $DEPMOD) ]; then
18+
echo "'make modules_install' requires $DEPMOD. Please install it." >&2
19+
echo "This is probably in the kmod package." >&2
20+
exit 1
21+
fi
22+
1723
# older versions of depmod require the version string to start with three
1824
# numbers, so we cheat with a symlink here
1925
depmod_hack_needed=true

0 commit comments

Comments
 (0)