940-kbuild-extract-modules-builtin-modinfo-from-vmlinux_o.patch 1.3 KB

1234567891011121314151617181920212223242526272829
  1. From: Mieczyslaw Nalewaj <[email protected]>
  2. Date: Tue, 16 Dec 2025 20:18:18 +0100
  3. Subject: [PATCH] kbuild: extract modules.builtin.modinfo from vmlinux.o
  4. Partially reverse https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.18.y&id=39cfd5b12160be4f57df1c3ba60139741c827616
  5. to prevent generation of empty modules.builtin.modinfo and modules.builtin
  6. files that cause modules compilation errors.
  7. If an out-of-tree package or any kernel-install rule ran modprobe xyz while
  8. the build was still in progress, and xyz had been configured =y, a clean tree
  9. would already have xyz listed in modules.builtin; with the empty file produced
  10. by the buggy rule it was missing, so modprobe emitted "module xyz not found"
  11. even though the code was sitting inside the freshly built vmlinux.
  12. Signed-off-by: Mieczyslaw Nalewaj <[email protected]>
  13. ---
  14. scripts/Makefile.vmlinux | 2 +-
  15. 1 file changed, 1 insertion(+), 1 deletion(-)
  16. --- a/scripts/Makefile.vmlinux
  17. +++ b/scripts/Makefile.vmlinux
  18. @@ -119,7 +119,7 @@ quiet_cmd_modules_builtin_modinfo = GEN
  19. OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary
  20. targets += modules.builtin.modinfo
  21. -modules.builtin.modinfo: vmlinux.unstripped FORCE
  22. +modules.builtin.modinfo: vmlinux.o FORCE
  23. $(call if_changed,modules_builtin_modinfo)
  24. # modules.builtin