Skip to content

Commit

Permalink
kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
masahir0y committed Jul 17, 2019
1 parent 0e5d8b7 commit d56aec1
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions scripts/Makefile.modinst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d56aec1

Please sign in to comment.