On 6/6/25 4:28 PM, Josh Poimboeuf wrote: > On Fri, Jun 06, 2025 at 12:03:45PM -0700, Josh Poimboeuf wrote: >> On Fri, Jun 06, 2025 at 09:05:59AM -0400, Joe Lawrence wrote: >>> Should the .cmd file copy come from the reference SRC and not original >>> ORIG directory? >>> >>> cmd_file="$SRC/$(dirname "$rel_file")/.$(basename "$rel_file").cmd" >>> >>> because I don't see any .cmd files in klp-tmp/orig/ >>> >>> FWIW, I only noticed this after backporting the series to >>> centos-stream-10. There, I got this build error: >>> >>> Building original kernel >>> Copying original object files >>> Fixing patches >>> Building patched kernel >>> Copying patched object files >>> Diffing objects >>> vmlinux.o: changed function: cmdline_proc_show >>> Building patch module: livepatch-test.ko >>> <...>/klp-tmp/kmod/.vmlinux.o.cmd: No such file or directory >>> make[2]: *** [scripts/Makefile.modpost:145: >>> <...>/klp-tmp/kmod/Module.symvers] Error 1 >>> make[1]: *** [<...>/Makefile:1936: modpost] Error 2 >>> make: *** [Makefile:236: __sub-make] Error 2 >>> >>> The above edit worked for both your upstream branch and my downstream >>> backport. >> >> Hm, I broke this in one of my refactorings before posting. >> >> Is this with CONFIG_MODVERSIONS? >> >> If you get a chance to test, here's a fix (currently untested): > > It was indeed CONFIG_MODVERSIONS. I verified the fix works. > > All the latest fixes are in my klp-build branch: > > git://git.kernel.org/pub/scm/linux/kernel/git/jpoimboe/linux.git klp-build > > I hope to post v3 next week and then start looking at merging patches -- > if not all of them, then at least the first ~40 dependency patches which > are mostly standalone improvements. >
Ack, I tested this update with CONFIG_MODVERSIONS for both vmlinux and module cases with success :) -- Joe
