From c4dc91989ccb41ac95557e38007d909080843623 Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Thu, 17 Apr 2025 15:07:05 +0800 Subject: [PATCH] ignore the change of the hibifur module Signed-off-by: jinsaihang (cherry picked from commit 4b43cd9213a11ed1095e523a2cd5beab9c73882a) --- ...ore-the-change-of-the-hibifur-module.patch | 24 +++++++++++++++++++ kpatch.spec | 9 ++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 huawei-ignore-the-change-of-the-hibifur-module.patch diff --git a/huawei-ignore-the-change-of-the-hibifur-module.patch b/huawei-ignore-the-change-of-the-hibifur-module.patch new file mode 100644 index 0000000..7dfe302 --- /dev/null +++ b/huawei-ignore-the-change-of-the-hibifur-module.patch @@ -0,0 +1,24 @@ +From 0a982453f9d4c4c5d08eaae6dab3d4d015aa2aea Mon Sep 17 00:00:00 2001 +From: jinsaihang +Date: Fri, 18 Apr 2025 09:34:46 +0800 +Subject: [PATCH] ignore the change of the hibifur module + +Signed-off-by: jinsaihang + +diff --git a/kpatch-build/kpatch-cc b/kpatch-build/kpatch-cc +index 6f14fd1..509d1ca 100755 +--- a/kpatch-build/kpatch-cc ++++ b/kpatch-build/kpatch-cc +@@ -54,7 +54,8 @@ if [[ "$TOOLCHAINCMD" =~ ^(.*-)?gcc$ || + tools/*|\ + .*.o|\ + */.lib_exports.o|\ +- drivers/net/ethernet/3snic/sssnic/*) ++ drivers/net/ethernet/3snic/sssnic/*|\ ++ drivers/net/ethernet/huawei/hibifur/*) + break + ;; + *.o) +-- +2.27.0 + diff --git a/kpatch.spec b/kpatch.spec index 3f2df24..5b87e5d 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,7 +1,7 @@ Name: kpatch Epoch: 1 Version: 0.9.9 -Release: 11 +Release: 12 Summary: A Linux dynamic kernel patching infrastructure License: GPLv2 @@ -62,6 +62,7 @@ Patch9004:huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch 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 BuildRequires: gcc elfutils-libelf-devel kernel-devel git %ifarch ppc64le @@ -125,6 +126,12 @@ popd %{_mandir}/man1/*.1.gz %changelog +* Thu Apr 17 2025 jinsaihang - 1:0.9.9-12 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:ignore the change of the hibifur module + * Tue Mar 18 2025 yixiangzhike - 1:0.9.9-11 - Type:bugfix - CVE:NA -- Gitee