sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

livepatch/klp-build: Fix inconsistent kernel version 

If .config hasn't been synced with auto.conf, any recent changes to
CONFIG_LOCALVERSION* may not get reflected in the kernel version name.

Use "make syncconfig" to force them to sync, and "make -s kernelrelease"
to get the version instead of having to construct it manually.

Fixes: 24ebfcd65a ("livepatch/klp-build: Introduce klp-build script for generating livepatch modules")
Closes: https://lore.kernel.org/20260217160645.3434685-10-joe.lawrence@redhat.com
Reported-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
Acked-by: Song Liu <song@kernel.org>
Link: https://patch.msgid.link/20260310203751.1479229-10-joe.lawrence@redhat.com
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
This commit is contained in:
Josh Poimboeuf 2026-03-10 16:37:48 -04:00
parent 28e367a969
commit 6f93f7b068
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/livepatch/klp-build
View File

@ -285,15 +285,14 @@ set_module_name() {
# application from appending it with '+' due to a dirty git working tree. # application from appending it with '+' due to a dirty git working tree.
set_kernelversion() { set_kernelversion() {
local file="$SRC/scripts/setlocalversion" local file="$SRC/scripts/setlocalversion"
local localversion local kernelrelease
stash_file "$file" stash_file "$file"
localversion="$(cd "$SRC" && make --no-print-directory kernelversion)" kernelrelease="$(cd "$SRC" && make syncconfig &>/dev/null && make -s kernelrelease)"
localversion="$(cd "$SRC" && KERNELVERSION="$localversion" ./scripts/setlocalversion)" [[ -z "$kernelrelease" ]] && die "failed to get kernel version"
[[ -z "$localversion" ]] && die "setlocalversion failed"
sed -i "2i echo $localversion; exit 0" scripts/setlocalversion sed -i "2i echo $kernelrelease; exit 0" scripts/setlocalversion
} }
get_patch_files() { get_patch_files() {