[usebeforefree]

Otherwise the script is environment sensitive.

I've discovered this when running:

$ kpatch-build \
    --oot-module "$PWD/test_module_module_repatching.ko" \
    --oot-module-src "$PWD" \
    -n test_klp_module_repatching klp_module_repatching.patch

ERROR: --variant requires --sourcerpm or --sourcedir.

This is an edge case that should be handled as well in this, or another PR.

[usebeforefree]

Variant is in fact assigned in oot paths, via ARCHVERSION:

kpatch/kpatch-build/kpatch-build

Lines 980 to 982 in 943425a

	if [[ -n "$OOT_MODULE" ]]; then
	ARCHVERSION="$(modinfo -F vermagic "$OOT_MODULE" | awk '{print $1}')"
	fi

finally:

kpatch/kpatch-build/kpatch-build

Lines 1020 to 1022 in 943425a

	if [[ -z "$VARIANT" ]] && [[ "$ARCHVERSION" =~ \+(.*)$ ]]; then
	VARIANT="${BASH_REMATCH[1]//_/-}"
	fi

But it doesn't do anything as far as I can see.

In order not to create bugs and/or raise cryptic errors, I suggest this fix for now:

diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index 67a0e54..2bb02c3 100755
--- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build
@@ -939,6 +939,10 @@ if [[ -n "$SRCRPM" ]]; then
        fi
 fi

+if [[ -n "$KVARIANT" && -n "$OOT_MODULE" ]]; then
+       die "--variant is incompatible with --oot-module"
+fi
+
 if [[ -n "$KVARIANT" && -z "$SRCRPM" && -z "$USERSRCDIR" ]]; then
        die "--variant requires --sourcerpm or --sourcedir"
 fi

[usebeforefree]

Tests passed, merging