diff options
| author | Maxime Ripard <mripard@kernel.org> | 2026-04-23 15:43:06 +0300 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2026-04-23 15:43:06 +0300 |
| commit | d13e855ee923c2ae78307bf6c354305f1406b9e2 (patch) | |
| tree | 07313514d19864c9e269993220dbcc5070df4504 /scripts/livepatch | |
| parent | 0b13173d27fa15679463b62a10cfa8b3d6c3a71c (diff) | |
| parent | 028ef9c96e96197026887c0f092424679298aae8 (diff) | |
| download | linux-d13e855ee923c2ae78307bf6c354305f1406b9e2.tar.xz | |
Merge drm/drm-fixes into drm-misc-fixes
Tomi needs 7.0 to apply a patch from drm-misc-fixes.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'scripts/livepatch')
| -rwxr-xr-x | scripts/livepatch/klp-build | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/livepatch/klp-build b/scripts/livepatch/klp-build index 809e198a561d..7b82c7503c2b 100755 --- a/scripts/livepatch/klp-build +++ b/scripts/livepatch/klp-build @@ -285,15 +285,14 @@ set_module_name() { # application from appending it with '+' due to a dirty git working tree. set_kernelversion() { local file="$SRC/scripts/setlocalversion" - local localversion + local kernelrelease stash_file "$file" - localversion="$(cd "$SRC" && make --no-print-directory kernelversion)" - localversion="$(cd "$SRC" && KERNELVERSION="$localversion" ./scripts/setlocalversion)" - [[ -z "$localversion" ]] && die "setlocalversion failed" + kernelrelease="$(cd "$SRC" && make syncconfig &>/dev/null && make -s kernelrelease)" + [[ -z "$kernelrelease" ]] && die "failed to get kernel version" - sed -i "2i echo $localversion; exit 0" scripts/setlocalversion + sed -i "2i echo $kernelrelease; exit 0" scripts/setlocalversion } get_patch_files() { |