From 469e9e761fc36c4e9784d75a20213e0935630d0a Mon Sep 17 00:00:00 2001 From: Wardenjohn Date: Sun, 29 Sep 2024 14:32:45 +0800 Subject: [PATCH] kpatch-build: fix the bug of exporting extra version This commit fix the following bugs: 1. wrong local parameters: calling of local_version should be localversion 2. unable to export extra version when source repo is not a git repo. --- ...ild-fix-the-dirty-vermagic-of-kernel-versio.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/patches/0019-kpatch-build-fix-the-dirty-vermagic-of-kernel-versio.patch b/patches/0019-kpatch-build-fix-the-dirty-vermagic-of-kernel-versio.patch index afbeb9e..1f7c1b8 100644 --- a/patches/0019-kpatch-build-fix-the-dirty-vermagic-of-kernel-versio.patch +++ b/patches/0019-kpatch-build-fix-the-dirty-vermagic-of-kernel-versio.patch @@ -1,22 +1,22 @@ -From 7823dee0550d9b94a8ac2663d9cbded86c6da08d Mon Sep 17 00:00:00 2001 +From b64abb8fe32871b0ada855a8d6853c9f02c9ec49 Mon Sep 17 00:00:00 2001 From: Wardenjohn Date: Wed, 25 Sep 2024 17:24:34 +0800 Subject: [PATCH] kpatch-build: fix the dirty vermagic of kernel version diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build -index 08843d4..aef22e1 100755 +index 08843d4..87795f6 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build @@ -917,6 +917,7 @@ if [[ -n "$USERSRCDIR" ]]; then ARCHVERSION="$(kernel_version_from_config)" fi fi -+ local_version="${ARCHVERSION#*-}" ++ localversion="${ARCHVERSION#*-}" fi if [[ -n "$OOT_MODULE" ]]; then -@@ -1174,11 +1175,16 @@ fi +@@ -1174,11 +1175,20 @@ fi # changes to the source. if [[ -n "$USERSRCDIR" && -e "$KERNEL_SRCDIR/.git" ]]; then cd "$KERNEL_SRCDIR" || die @@ -33,8 +33,12 @@ index 08843d4..aef22e1 100755 + echo "echo $LOCALVERSION" > scripts/setlocalversion + else + # this kernel version is pre-v6.3 ++ echo "-${localversion}" + export LOCALVERSION="-${localversion}" + fi ++else ++ # this is not a git repo ++ export LOCALVERSION="-${localversion}" fi # kernel option checking -- Gitee