summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2023-08-23 20:50:43 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2023-08-29 22:38:23 +0900
commit79b96c332241c06b4c63cfa0e23a539558b79b90 (patch)
tree4ee58486fb571dd15c83edfaf861d0d253222df1 /scripts
parenteb931e12194b69b59e6badb06cf1b53e6106ccee (diff)
downloadlinux-stable-79b96c332241c06b4c63cfa0e23a539558b79b90.tar.gz
linux-stable-79b96c332241c06b4c63cfa0e23a539558b79b90.tar.bz2
linux-stable-79b96c332241c06b4c63cfa0e23a539558b79b90.zip
kbuild: move depmod rule to scripts/Makefile.modinst
depmod is a part of the module installation. scripts/Makefile.modinst is a better place to run it. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.modinst9
-rwxr-xr-xscripts/depmod.sh12
2 files changed, 16 insertions, 5 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index ab0c5bd1a60f..7a64ece9b826 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -86,6 +86,15 @@ $(dst)/%.ko: $(extmod_prefix)%.ko FORCE
$(call cmd,strip)
$(call cmd,sign)
+__modinst: depmod
+
+PHONY += depmod
+depmod: $(modules)
+ $(call cmd,depmod)
+
+quiet_cmd_depmod = DEPMOD $(MODLIB)
+ cmd_depmod = $(srctree)/scripts/depmod.sh $(KERNELRELEASE)
+
else
$(dst)/%.ko: FORCE
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index fca689ba4f21..e22da27fe13e 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -1,14 +1,16 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
#
-# A depmod wrapper used by the toplevel Makefile
+# A depmod wrapper
-if test $# -ne 2; then
- echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
+if test $# -ne 1; then
+ echo "Usage: $0 <kernelrelease>" >&2
exit 1
fi
-DEPMOD=$1
-KERNELRELEASE=$2
+
+KERNELRELEASE=$1
+
+: ${DEPMOD:=depmod}
if ! test -r System.map ; then
echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2