diff options
| author | Joe Lawrence <joe.lawrence@redhat.com> | 2026-03-10 16:37:49 -0400 |
|---|---|---|
| committer | Josh Poimboeuf <jpoimboe@kernel.org> | 2026-03-16 12:52:53 -0700 |
| commit | b41d8b7d1752f2f85fc1a87f5e4f4dda45adad15 (patch) | |
| tree | 734fd780b8463bcc60cccaaf136b11d1f4f37d92 /scripts | |
| parent | e506ad210d6d7aeaff4bca777428c8c8f9850150 (diff) | |
livepatch/klp-build: provide friendlier error messages
Provide more context for common klp-build failure modes. Clarify which
user-provided patch is unsupported or failed to apply, and explicitly
identify which kernel build (original or patched) failed.
Acked-by: Song Liu <song@kernel.org>
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
Link: https://patch.msgid.link/20260310203751.1479229-11-joe.lawrence@redhat.com
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/livepatch/klp-build | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/livepatch/klp-build b/scripts/livepatch/klp-build index 60c7635e65c1..dc0a23a8908b 100755 --- a/scripts/livepatch/klp-build +++ b/scripts/livepatch/klp-build @@ -342,7 +342,7 @@ check_unsupported_patches() { for file in "${files[@]}"; do case "$file" in lib/*|*.S) - die "unsupported patch to $file" + die "${patch}: unsupported patch to $file" ;; esac done @@ -487,6 +487,7 @@ clean_kernel() { } build_kernel() { + local build="$1" local log="$TMP_DIR/build.log" local objtool_args=() local cmd=() @@ -524,7 +525,7 @@ build_kernel() { "${cmd[@]}" \ 1> >(tee -a "$log") \ 2> >(tee -a "$log" | grep0 -v "modpost.*undefined!" >&2) - ) + ) || die "$build kernel build failed" } find_objects() { @@ -799,7 +800,7 @@ fi if (( SHORT_CIRCUIT <= 1 )); then status "Building original kernel" clean_kernel - build_kernel + build_kernel "original" status "Copying original object files" copy_orig_objects fi @@ -809,7 +810,7 @@ if (( SHORT_CIRCUIT <= 2 )); then fix_patches apply_patches status "Building patched kernel" - build_kernel + build_kernel "patched" revert_patches status "Copying patched object files" copy_patched_objects |