diff --git a/0036-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch b/0036-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch new file mode 100644 index 0000000..cd0d4e7 --- /dev/null +++ b/0036-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch @@ -0,0 +1,26 @@ +From 44026d09697e612c2bc6f08b1a219f09c40a1e11 Mon Sep 17 00:00:00 2001 +From: Cai Xiaomeng +Date: Sat, 13 Jul 2024 14:53:06 +0800 +Subject: [PATCH] fix sssnic module always changes, kpatch relying on sssnic + problem + +--- + kpatch-build/kpatch-gcc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc +index 80d310c..688d92b 100755 +--- a/kpatch-build/kpatch-gcc ++++ b/kpatch-build/kpatch-gcc +@@ -49,7 +49,8 @@ if [[ "$TOOLCHAINCMD" =~ ^(.*-)?gcc$ || + arch/powerpc/kernel/prom_init.o|\ + lib/*|\ + .*.o|\ +- */.lib_exports.o) ++ */.lib_exports.o|\ ++ drivers/net/ethernet/3snic/sssnic/*) + break + ;; + *.o) +-- +2.33.0 diff --git a/kpatch.spec b/kpatch.spec index 536c840..512f402 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,7 +1,7 @@ Name: kpatch Epoch: 1 Version: 0.9.1 -Release: 22 +Release: 23 Summary: A Linux dynamic kernel patching infrastructure License: GPLv2 @@ -47,6 +47,7 @@ Patch0032:0032-create-diff-object-Fix-out-of-range-relocation-error.patch Patch0033:0033-create-diff-object-Fix-out-of-range-relocation-check.patch Patch0034:0034-add-openEuler-build-support.patch Patch0035:0035-kpatch-build-fix-gcc-version-check-when-using-OOT_MO.patch +Patch0036:0036-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch BuildRequires: gcc elfutils-libelf-devel kernel-devel git %ifarch ppc64le @@ -110,6 +111,12 @@ popd %{_mandir}/man1/*.1.gz %changelog +* Tue Jul 16 2024 caixiaomeng -1:0.9.1-23 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:ignore sssnic module when building hotpatch to fix sssnic wrongly dependency of sssnic + * Wed Jun 12 2024 gengqihu -1:0.9.1-22 - Type:enhancement - ID:NA