Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

kbuild: move depmod rule to scripts/Makefile.modinst

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2023-08-23 20:50:43 +09:00
parent eb931e1219
commit 79b96c3322
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -509,7 +509,6 @@ LEX = flex
YACC = bison YACC = bison
AWK = awk AWK = awk
INSTALLKERNEL := installkernel INSTALLKERNEL := installkernel
DEPMOD = depmod
PERL = perl PERL = perl
PYTHON3 = python3 PYTHON3 = python3
CHECK = sparse CHECK = sparse
@ -1871,15 +1870,8 @@ PHONY += modules_check
modules_check: $(MODORDER) modules_check: $(MODORDER)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh $< $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh $<
quiet_cmd_depmod = DEPMOD $(MODLIB)
cmd_depmod = $(CONFIG_SHELL) $(srctree)/scripts/depmod.sh $(DEPMOD) \
$(KERNELRELEASE)
modules_install: modules_install:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
ifndef modules_sign_only
$(call cmd,depmod)
endif
else # CONFIG_MODULES else # CONFIG_MODULES

9
scripts/Makefile.modinst
View File

@ -86,6 +86,15 @@ $(dst)/%.ko: $(extmod_prefix)%.ko FORCE
$(call cmd,strip) $(call cmd,strip)
$(call cmd,sign) $(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 else
$(dst)/%.ko: FORCE $(dst)/%.ko: FORCE

12
scripts/depmod.sh
View File

@ -1,14 +1,16 @@
#!/bin/sh #!/bin/sh
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# #
# A depmod wrapper used by the toplevel Makefile # A depmod wrapper
if test $# -ne 2; then if test $# -ne 1; then
echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2 echo "Usage: $0 <kernelrelease>" >&2
exit 1 exit 1
fi fi
DEPMOD=$1
KERNELRELEASE=$2 KERNELRELEASE=$1
: ${DEPMOD:=depmod}
if ! test -r System.map ; then if ! test -r System.map ; then
echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2 echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2