diff options
| author | Mark Brown <broonie@kernel.org> | 2026-03-24 01:02:41 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-03-24 01:02:41 +0300 |
| commit | 1fe7579ab0a51513ba35cfb3cde62706df31912f (patch) | |
| tree | da4fe6b21d7aea11eefb9415bd13df6dba3bdf0f /scripts | |
| parent | ea0e916de13426dc62fc349f80bf5326adb17cea (diff) | |
| parent | 579a49aaab0814c55595cddf0be9651e37972f6a (diff) | |
| download | linux-1fe7579ab0a51513ba35cfb3cde62706df31912f.tar.xz | |
spi: hisi-kunpeng cleanup and fix
Pei Xiao <xiaopei01@kylinos.cn> says:
I might have wasted your valuable time again. Please help check the two
modifications. Thank you!
Diffstat (limited to 'scripts')
| -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() { |