summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-07-17 15:17:53 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-07-17 22:39:27 +0900
commitd56aec102c0c462b94513421726e33938695cef4 (patch)
treecfef375ced4258f8bb119d6882daf5e366eb0808 /scripts
parent0e5d8b7fb2c675b4fe45adee289e640e848dd881 (diff)
downloadlinux-d56aec102c0c462b94513421726e33938695cef4.tar.gz
linux-d56aec102c0c462b94513421726e33938695cef4.tar.bz2
linux-d56aec102c0c462b94513421726e33938695cef4.zip
kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod
Towards the goal of removing MODVERDIR, read out modules.order to get the list of modules to be installed. This is simpler than parsing *.mod files in $(MODVERDIR). For external modules, $(KBUILD_EXTMOD)/modules.order should be read. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.modinst5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 0dae402661f3..5a4579e76485 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -8,10 +8,7 @@ __modinst:
include scripts/Kbuild.include
-#
-
-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
-modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
+modules := $(sort $(shell cat $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)modules.order))
PHONY += $(modules)
__modinst: $(modules)