From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 17 Jul 2019 06:17:53 +0000 (+0900)
Subject: kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod
X-Git-Tag: v5.4-rc1~492^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d56aec102c0c462b94513421726e33938695cef4;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 0dae402..5a4579e 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)