From 12204ad8649f35c2e77ca49da47ade949d07426e Mon Sep 17 00:00:00 2001
From: Wardenjohn <zhangwarden@gmail.com>
Date: Wed, 25 Sep 2024 16:31:02 +0800
Subject: [PATCH] fix dirty vermagic of per-v6.3 kernelversion

---
 .../0007-kpatch-build-set-EXTRAVERSION.patch  | 26 -----------
 ...-the-dirty-vermagic-of-kernel-versio.patch | 43 +++++++++++++++++++
 2 files changed, 43 insertions(+), 26 deletions(-)
 delete mode 100644 patches/0007-kpatch-build-set-EXTRAVERSION.patch
 create mode 100644 patches/0019-kpatch-build-fix-the-dirty-vermagic-of-kernel-versio.patch

diff --git a/patches/0007-kpatch-build-set-EXTRAVERSION.patch b/patches/0007-kpatch-build-set-EXTRAVERSION.patch
deleted file mode 100644
index 0cb0225..0000000
--- a/patches/0007-kpatch-build-set-EXTRAVERSION.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 91ca1a8c7f287a022d5768c1189a6b453910dfb6 Mon Sep 17 00:00:00 2001
-From: Jian Wen <wenjian1@xiaomi.com>
-Date: Fri, 3 Feb 2023 15:36:24 +0800
-Subject: [PATCH] kpatch-build: set EXTRAVERSION
-
-Adding the version string to the kernel Makefile EXTRAVERSION as
-rpmbuild would do (minus the perl voodoo).
-
-Fixes: #1
-Signed-off-by: Jian Wen <wenjian1@xiaomi.com>
-
-diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
-index 8632434..2afb3a1 100755
---- a/kpatch-build/kpatch-build
-+++ b/kpatch-build/kpatch-build
-@@ -856,6 +856,7 @@ if [[ -n "$USERSRCDIR" ]]; then
-         if [[ -z "$ARCHVERSION" ]] && [[ -f "$CONFIGFILE" ]]; then
-             ARCHVERSION="$(kernel_version_from_config)"
-         fi
-+        sed -i "s/^EXTRAVERSION.*/EXTRAVERSION = -${ARCHVERSION##*-}/" "$KERNEL_SRCDIR/Makefile" || die
- 	fi
- fi
- 
--- 
-2.37.3
-
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
new file mode 100644
index 0000000..afbeb9e
--- /dev/null
+++ b/patches/0019-kpatch-build-fix-the-dirty-vermagic-of-kernel-versio.patch
@@ -0,0 +1,43 @@
+From 7823dee0550d9b94a8ac2663d9cbded86c6da08d Mon Sep 17 00:00:00 2001
+From: Wardenjohn <zhangwarden@gmail.com>
+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
+--- 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#*-}"
+ fi
+ 
+ if [[ -n "$OOT_MODULE" ]]; then
+@@ -1174,11 +1175,16 @@ fi
+ # changes to the source.
+ if [[ -n "$USERSRCDIR" && -e "$KERNEL_SRCDIR/.git" ]]; then
+ 	cd "$KERNEL_SRCDIR" || die
+-	cp -f scripts/setlocalversion "$TEMPDIR" || die
+-	LOCALVERSION="$(make kernelversion)"
+-	LOCALVERSION="$(KERNELVERSION="$LOCALVERSION" ./scripts/setlocalversion)"
+-	[[ -n "$LOCALVERSION" ]] || die "setlocalversion failed"
+-	echo "echo $LOCALVERSION" > scripts/setlocalversion
++	if ! ./scripts/setlocalversion --save-scmversion &>/dev/null; then
++		cp -f scripts/setlocalversion "$TEMPDIR" || die
++		LOCALVERSION="$(make kernelversion)"
++		LOCALVERSION="$(KERNELVERSION="$LOCALVERSION" ./scripts/setlocalversion)"
++		[[ -n "$LOCALVERSION" ]] || die "setlocalversion failed"
++		echo "echo $LOCALVERSION" > scripts/setlocalversion
++	else
++		# this kernel version is pre-v6.3
++		export LOCALVERSION="-${localversion}"
++	fi
+ fi
+ 
+ # kernel option checking
+-- 
+2.37.3
+
-- 
Gitee