Re: [PATCH v2 59/62] livepatch/klp-build: Introduce klp-build script for generating livepatch modules

[Joe Lawrence]

On Fri, May 09, 2025 at 01:17:23PM -0700, Josh Poimboeuf wrote:
> +revert_patch() {
> +     local patch="$1"
> +     shift
> +     local extra_args=("$@")
> +     local tmp=()
> +
> +     ( cd "$SRC" && git apply --reverse "${extra_args[@]}" "$patch" )
> +     git_refresh "$patch"
> +
> +     for p in "${APPLIED_PATCHES[@]}"; do
> +             [[ "$p" == "$patch" ]] && continue
> +             tmp+=("$p")
> +     done
> +
> +     APPLIED_PATCHES=("${tmp[@]}")
> +}

You may consider a slight adjustment to revert_patch() to handle git
format-patch generated .patches?  The reversal trips up on the git
version trailer:

  warning: recount: unexpected line: 2.47.1

diff --git a/scripts/livepatch/klp-build b/scripts/livepatch/klp-build
index f7d88726ed4f..8cf0cd8f5fd3 100755
--- a/scripts/livepatch/klp-build
+++ b/scripts/livepatch/klp-build
@@ -345,7 +345,8 @@ revert_patch() {
        local extra_args=("$@")
        local tmp=()

-       ( cd "$SRC" && git apply --reverse "${extra_args[@]}" "$patch" )
+       ( cd "$SRC" && \
+         git apply --reverse "${extra_args[@]}" <(sed -n '/^-- /q;p' "$patch") 
)
        git_refresh "$patch"

        for p in "${APPLIED_PATCHES[@]}"; do