[v2] kbuild: verify that $DEPMOD is installed

Commit Message

Randy Dunlap July 2, 2018, 2:46 a.m. UTC

From: Randy Dunlap <[e-mail]>

Verify that 'depmod' ($DEPMOD) is installed.
This is a partial revert of 620c231c7a7f (from 2012):
  ("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 <[e-mail]>
Cc: Lucas De Marchi <[e-mail]>
Cc: Lucas De Marchi <[e-mail]>
Cc: Michal Marek <[e-mail]>
Cc: Jessica Yu <[e-mail]>
Cc: Chih-Wei Huang <[e-mail]>
Cc: [e-mail] # any kernel since 2012
---
v2:
- spell out that modules_install requires $DEPMOD
- remove references to module-init-tools from
  Documentation/process/changes.rst and add kmod

 Documentation/process/changes.rst |   19 +++++++------------
 scripts/depmod.sh                 |    8 +++++++-
 2 files changed, 14 insertions(+), 13 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Masahiro Yamada July 6, 2018, 12:38 a.m. UTC | #1

2018-07-02 11:46 GMT+09:00 Randy Dunlap <[e-mail]>:
> From: Randy Dunlap <[e-mail]>
>
> Verify that 'depmod' ($DEPMOD) is installed.
> This is a partial revert of 620c231c7a7f (from 2012):
>   ("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 <[e-mail]>
> Cc: Lucas De Marchi <[e-mail]>
> Cc: Lucas De Marchi <[e-mail]>
> Cc: Michal Marek <[e-mail]>
> Cc: Jessica Yu <[e-mail]>
> Cc: Chih-Wei Huang <[e-mail]>
> Cc: [e-mail] # any kernel since 2012

Applied to linux-kbuild. Thanks!

Patch

--- lnx-418-rc3.orig/scripts/depmod.sh
+++ lnx-418-rc3/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
--- lnx-418-rc3.orig/Documentation/process/changes.rst
+++ lnx-418-rc3/Documentation/process/changes.rst
@@ -35,7 +35,7 @@  binutils               2.20
 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`` an
 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
 --------