diff options
| author | Takashi Iwai <tiwai@suse.de> | 2026-04-01 15:42:56 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2026-04-01 15:43:00 +0300 |
| commit | 0542972950ef26670a5696e43c0ea2b7b6ac96d4 (patch) | |
| tree | 9a38714da776c84a22efcdd8d82905bd7a9903a6 /scripts/livepatch | |
| parent | 579e7b820de5dd5124585413bb5e9c278d255436 (diff) | |
| parent | a0dafdbd1049a8ea661a1a471be1b840bd8aed13 (diff) | |
| download | linux-0542972950ef26670a5696e43c0ea2b7b6ac96d4.tar.xz | |
Merge branch 'for-linus' into for-next
Pull 7.0 devel branch for further cleanups of ctxfi driver & co.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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() { |