| From 934193a654c1f4d0643ddbf4b2529b508cae926e Mon Sep 17 00:00:00 2001 |
| From: Randy Dunlap <rdunlap@infradead.org> |
| Date: Sun, 1 Jul 2018 19:46:06 -0700 |
| Subject: kbuild: verify that $DEPMOD is installed |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| commit 934193a654c1f4d0643ddbf4b2529b508cae926e upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| Documentation/process/changes.rst | 19 +++++++------------ |
| scripts/depmod.sh | 8 +++++++- |
| 2 files changed, 14 insertions(+), 13 deletions(-) |
| |
| --- a/Documentation/process/changes.rst |
| +++ b/Documentation/process/changes.rst |
| @@ -33,7 +33,7 @@ GNU C 3.2 |
| GNU make 3.81 make --version |
| binutils 2.20 ld -v |
| 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 |
| @@ -141,12 +141,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 |
| -------- |
| |
| @@ -346,16 +340,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 |
| -------- |
| |
| --- a/scripts/depmod.sh |
| +++ b/scripts/depmod.sh |
| @@ -11,10 +11,16 @@ DEPMOD=$1 |
| KERNELRELEASE=$2 |
| SYMBOL_PREFIX=$3 |
| |
| -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 don't support -P <symbol-prefix> |
| # support was added in module-init-tools 3.13 |
| if test -n "$SYMBOL_PREFIX"; then |
