Create modules.builtin.modinfo as a combination of modinfo from vmlinux and the result of generating modalias by modpost.
Signed-off-by: Alexey Gladkov <leg...@kernel.org> --- scripts/Makefile.vmlinux | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux index 250c0492b7e0..8fed895fd858 100644 --- a/scripts/Makefile.vmlinux +++ b/scripts/Makefile.vmlinux @@ -70,6 +70,18 @@ endif ifdef CONFIG_MODULES targets += .vmlinux.export.o $(vmlinux-final): .vmlinux.export.o + +# .module.builtin.modinfo.modpost +# --------------------------------------------------------------------------- +__default: .modules.builtin.modinfo.modpost + +OBJCOPYFLAGS_.modules.builtin.modinfo.modpost := -j .modinfo -O binary + +targets += .modules.builtin.modinfo.modpost +.modules.builtin.modinfo.modpost: .vmlinux.export.o FORCE + $(call if_changed,objcopy) + +modules.builtin.modinfo: .modules.builtin.modinfo.modpost endif ifdef CONFIG_ARCH_WANTS_PRE_LINK_VMLINUX @@ -97,14 +109,26 @@ ifdef CONFIG_BUILDTIME_TABLE_SORT $(vmlinux-final): scripts/sorttable endif +# .module.builtin.modinfo.vmlinux +# --------------------------------------------------------------------------- +__default: .modules.builtin.modinfo.vmlinux + +OBJCOPYFLAGS_.modules.builtin.modinfo.vmlinux := -j .modinfo -O binary + +targets += .modules.builtin.modinfo.vmlinux +.modules.builtin.modinfo.vmlinux: vmlinux.o FORCE + $(call if_changed,objcopy) + # modules.builtin.modinfo # --------------------------------------------------------------------------- -OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary +quiet_cmd_modules_builtin_modinfo = GEN $@ + cmd_modules_builtin_modinfo = \ + cat $< $(wildcard .modules.builtin.modinfo.modpost) > $@ targets += modules.builtin.modinfo -modules.builtin.modinfo: vmlinux.o FORCE - $(call if_changed,objcopy) +modules.builtin.modinfo: .modules.builtin.modinfo.vmlinux FORCE + $(call if_changed,modules_builtin_modinfo) # modules.builtin # --------------------------------------------------------------------------- -- 2.49.0
