From 141898ff9accb5b1ccdd7830cb3cfc52d8da422d Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Wed, 28 May 2025 03:14:12 +0000 Subject: [PATCH] clarify real kernel path Signed-off-by: jinsaihang --- huawei-clarify-real-kernel-path.patch | 25 +++++++++++++++++++++++++ kpatch.spec | 9 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 huawei-clarify-real-kernel-path.patch diff --git a/huawei-clarify-real-kernel-path.patch b/huawei-clarify-real-kernel-path.patch new file mode 100644 index 0000000..2d9f8de --- /dev/null +++ b/huawei-clarify-real-kernel-path.patch @@ -0,0 +1,25 @@ +From ca6d5f7d8d3240b06692920ba0eea0a9ff76d294 Mon Sep 17 00:00:00 2001 +From: jinsaihang +Date: Tue, 3 Jun 2025 14:29:32 +0800 +Subject: [PATCH] clarify real kernel path + +--- + kpatch-build/kpatch-build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build +index b927555..94e606e 100755 +--- a/kpatch-build/kpatch-build ++++ b/kpatch-build/kpatch-build +@@ -1125,7 +1125,7 @@ fi + # Prevent that by replacing the original setlocalversion with a friendlier one + # which just echo's the original version. This should be done before any + # changes to the source. +-if [[ -n "$USERSRCDIR" && -e "$KERNEL_SRCDIR/.git" ]]; then ++if [[ -n "$USERSRCDIR" && -e "$KERNEL_SRCDIR/.git" && "$USERMODBUILDDIR"]]; then + cd "$KERNEL_SRCDIR" || die + cp -f scripts/setlocalversion "$TEMPDIR" || die + LOCALVERSION="$(make kernelversion)" +-- +2.27.0 + diff --git a/kpatch.spec b/kpatch.spec index 5b87e5d..6e75974 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,7 +1,7 @@ Name: kpatch Epoch: 1 Version: 0.9.9 -Release: 12 +Release: 13 Summary: A Linux dynamic kernel patching infrastructure License: GPLv2 @@ -63,6 +63,7 @@ Patch9005:huawei-adapt-arm64-dynamic-ftrace-call-with-2-nops.patch Patch9006:huawei-ignore-initcall5-section-to-adapt-6.6-kernel.patch Patch9007:huawei-remove-.export_symbol-section-to-avoid-compile-error.patch Patch9008:huawei-ignore-the-change-of-the-hibifur-module.patch +Patch9009:huawei-clarify-real-kernel-path.patch BuildRequires: gcc elfutils-libelf-devel kernel-devel git %ifarch ppc64le @@ -126,6 +127,12 @@ popd %{_mandir}/man1/*.1.gz %changelog +* Wed May 28 2025 jinsaihang - 1:0.9.9-13 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:clarify real kernel path + * Thu Apr 17 2025 jinsaihang - 1:0.9.9-12 - Type:bugfix - CVE:NA -- Gitee