]> git.ipfire.org Git - thirdparty/linux.git/commit
klp-build: Fix patch cleanup on interrupt
authorJosh Poimboeuf <jpoimboe@kernel.org>
Fri, 3 Apr 2026 02:08:39 +0000 (19:08 -0700)
committerJosh Poimboeuf <jpoimboe@kernel.org>
Tue, 5 May 2026 04:16:03 +0000 (21:16 -0700)
commitf3048888ea62ac1c573db91e74e0dcabe058e89f
tree2fb24a1c2938c2667bde8512da6ac5300bf10719
parent96524543740ead39a79cf36bb4361f93cde1629c
klp-build: Fix patch cleanup on interrupt

If a build error occurs and the user hits Ctrl-C while a large patch is
being reverted during cleanup, the cleanup EXIT trap gets re-triggered
and tries to re-revert the already partially-reverted patch.  That
causes 'patch -R' to repeatedly prompt

  "Unreversed patch detected!  Ignore -R? [n]"

for each already-reverted hunk, with no way to break out.

Fix it by adding '--force' to the patch revert command in
revert_patch(), which causes it to silently ignore already-reverted
hunks.  And ignore errors, as the cleanup is always best-effort.

For similar reasons, add to APPLIED_PATCHES before (rather than after)
applying the patch in apply_patch() so an interrupted apply will also
get cleaned up.

Fixes: d36a7343f4ba ("livepatch/klp-build: switch to GNU patch and recountdiff")
Acked-by: Song Liu <song@kernel.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
scripts/livepatch/klp-build