leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modpost: print symbol dump file as the build target in short log

Browse Source 
The symbol dump *.symvers is the output of modpost. Print it in
the short log.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2020-06-01 14:57:09 +09:00
parent e3fb4df7fe
commit bcfedae7d9
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/Makefile.modpost
View File

@ -44,25 +44,26 @@ include include/config/auto.conf
include scripts/Kbuild.include include scripts/Kbuild.include
kernelsymfile := $(objtree)/Module.symvers kernelsymfile := $(objtree)/Module.symvers
modulesymfile := $(KBUILD_EXTMOD)/Module.symvers
MODPOST = scripts/mod/modpost \ MODPOST = scripts/mod/modpost \
$(if $(CONFIG_MODVERSIONS),-m) \ $(if $(CONFIG_MODVERSIONS),-m) \
$(if $(CONFIG_MODULE_SRCVERSION_ALL),-a) \ $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a) \
$(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \ $(if $(KBUILD_EXTMOD),-i $(kernelsymfile)) \
$(if $(KBUILD_EXTMOD),$(addprefix -i ,$(KBUILD_EXTRA_SYMBOLS))) \ $(if $(KBUILD_EXTMOD),$(addprefix -i ,$(KBUILD_EXTRA_SYMBOLS))) \
$(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
$(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \
$(if $(KBUILD_MODPOST_WARN),-w) $(if $(KBUILD_MODPOST_WARN),-w) \
-o $@
ifdef MODPOST_VMLINUX ifdef MODPOST_VMLINUX
quiet_cmd_modpost = MODPOST vmlinux.o quiet_cmd_modpost = MODPOST $@
cmd_modpost = $(MODPOST) vmlinux.o cmd_modpost = $(MODPOST) $<
__modpost: Module.symvers: vmlinux.o
$(call cmd,modpost) $(call cmd,modpost)
__modpost: Module.symvers
else else
MODPOST += -s \ MODPOST += -s \
@ -70,6 +71,8 @@ MODPOST += -s \
ifeq ($(KBUILD_EXTMOD),) ifeq ($(KBUILD_EXTMOD),)
MODPOST += $(wildcard vmlinux) MODPOST += $(wildcard vmlinux)
output-symdump := Module.symvers
else else
# set src + obj - they may be used in the modules's Makefile # set src + obj - they may be used in the modules's Makefile
@ -83,6 +86,8 @@ include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
# modpost option for external modules # modpost option for external modules
MODPOST += -e MODPOST += -e
output-symdump := $(KBUILD_EXTMOD)/Module.symvers
endif endif
# modpost options for modules (both in-kernel and external) # modpost options for modules (both in-kernel and external)
@ -94,20 +99,22 @@ ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),)
MODPOST += -n MODPOST += -n
endif endif
# find all modules listed in modules.order # Read out modules.order to pass in modpost.
modules := $(sort $(shell cat $(MODORDER)))
# Read out modules.order instead of expanding $(modules) to pass in modpost.
# Otherwise, allmodconfig would fail with "Argument list too long". # Otherwise, allmodconfig would fail with "Argument list too long".
quiet_cmd_modpost = MODPOST $(words $(modules)) modules quiet_cmd_modpost = MODPOST $@
cmd_modpost = sed 's/ko$$/o/' $(MODORDER) | $(MODPOST) -T - cmd_modpost = sed 's/ko$$/o/' $(MODORDER) | $(MODPOST) -T -
__modpost: $(output-symdump): FORCE
$(call cmd,modpost) $(call cmd,modpost)
__modpost: $(output-symdump)
ifneq ($(KBUILD_MODPOST_NOFINAL),1) ifneq ($(KBUILD_MODPOST_NOFINAL),1)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal
endif endif
PHONY += FORCE
FORCE:
endif endif
.PHONY: $(PHONY) .PHONY: $(PHONY)