summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2023-08-23 14:50:46 +0300
committerMasahiro Yamada <masahiroy@kernel.org>2023-09-01 09:58:16 +0300
commit5e02797b8eb093ba73fcbdc6048d02a3f9fb7379 (patch)
tree55d377007bb888cf4b18c7ab1e1d7ee1cedf3f66 /Makefile
parent2dfec887c0fd7d25d26b2ba7e60479208f9b6fb8 (diff)
downloadlinux-5e02797b8eb093ba73fcbdc6048d02a3f9fb7379.tar.xz
kbuild: move more module installation code to scripts/Makefile.modinst
Move more relevant code to scripts/Makefile.modinst. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile34
1 files changed, 7 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index f61ad7ff0057..ceffb582bd0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1477,24 +1477,6 @@ endif
endif # CONFIG_MODULES
-modinst_pre :=
-ifneq ($(filter modules_install,$(MAKECMDGOALS)),)
-modinst_pre := __modinst_pre
-endif
-
-modules_install: $(modinst_pre)
-PHONY += __modinst_pre
-__modinst_pre:
- @rm -rf $(MODLIB)/kernel
- @rm -f $(MODLIB)/build
- @mkdir -p $(MODLIB)
-ifdef CONFIG_MODULES
- @ln -s $(CURDIR) $(MODLIB)/build
- @sed 's:^\(.*\)\.o$$:kernel/\1.ko:' modules.order > $(MODLIB)/modules.order
-endif
- @cp -f modules.builtin $(MODLIB)/
- @cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/
-
###
# Cleaning is done on three levels.
# make clean Delete most generated files
@@ -1836,12 +1818,15 @@ help:
@echo ' clean - remove generated files in module directory only'
@echo ''
+ifndef CONFIG_MODULES
+modules modules_install: __external_modules_error
__external_modules_error:
@echo >&2 '***'
@echo >&2 '*** The present kernel disabled CONFIG_MODULES.'
@echo >&2 '*** You cannot build or install external modules.'
@echo >&2 '***'
@false
+endif
endif # KBUILD_EXTMOD
@@ -1850,6 +1835,9 @@ endif # KBUILD_EXTMOD
PHONY += modules modules_install modules_prepare
+modules_install:
+ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
+
ifdef CONFIG_MODULES
$(MODORDER): $(build-dir)
@@ -1866,17 +1854,9 @@ PHONY += modules_check
modules_check: $(MODORDER)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh $<
-modules_install:
- $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
-
else # CONFIG_MODULES
-# Modules not configured
-# ---------------------------------------------------------------------------
-
-PHONY += __external_modules_error
-
-modules modules_install: __external_modules_error
+modules:
@:
KBUILD_MODULES :=