Commit ccae4cfa authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: refactor scripts/Makefile.modinst 



scripts/Makefile.modinst is ugly and weird in multiple ways; it
specifies real files $(modules) as phony, makes directory manipulation
needlessly too complicated.

Clean up the Makefile code, and show the full path of installed modules
in the log.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 7f69180b

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ endif # CONFIG_BPF 


PHONY += prepare0



extmod_prefix = $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)

export extmod_prefix = $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)

export MODORDER := $(extmod_prefix)modules.order

export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps

scripts/Makefile.modinst

+22 −18
Original line number Diff line number Diff line
@@ -8,28 +8,32 @@ __modinst: 


include $(srctree)/scripts/Kbuild.include



modules := $(sort $(shell cat $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/)modules.order))

modules := $(sort $(shell cat $(MODORDER)))



ifeq ($(KBUILD_EXTMOD),)

dst := $(MODLIB)/kernel

else

INSTALL_MOD_DIR ?= extra

dst := $(MODLIB)/$(INSTALL_MOD_DIR)

endif



modules := $(patsubst $(extmod_prefix)%, $(dst)/%, $(modules))



PHONY += $(modules)

__modinst: $(modules)

	@:



# Don't stop modules_install if we can't sign external modules.

quiet_cmd_modules_install = INSTALL $@

      cmd_modules_install = \

    mkdir -p $(2) ; \

    cp $@ $(2) ; \

    $(mod_strip_cmd) $(2)/$(notdir $@) ; \

    $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) ; \

    $(mod_compress_cmd) $(2)/$(notdir $@)



# Modules built outside the kernel source tree go into extra by default

INSTALL_MOD_DIR ?= extra

ext-mod-dir = $(INSTALL_MOD_DIR)$(subst $(patsubst %/,%,$(KBUILD_EXTMOD)),,$(@D))



modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))



$(modules):

	$(call cmd,modules_install,$(MODLIB)/$(modinst_dir))

quiet_cmd_install = INSTALL $@

      cmd_install = \

    mkdir -p $(dir $@); cp $< $@; \

    $(mod_strip_cmd) $@; \

    $(mod_sign_cmd) $@ $(patsubst %,|| true,$(KBUILD_EXTMOD)) ; \

    $(mod_compress_cmd) $@



$(modules): $(dst)/%: $(extmod_prefix)% FORCE

	$(call cmd,install)



PHONY += FORCE

FORCE:



.PHONY: $(PHONY)