From 13228b4f2f68ad7742dd2c6782b0ece4ffbcc8bd Mon Sep 17 00:00:00 2001
From: PhsySimon <caixiaomeng2@huawei.com>
Date: Sat, 13 Jul 2024 16:36:24 +0800
Subject: [PATCH] ignore sssnic module when building hotpatch to fix sssnic
 wrongly dependency of sssnic

---
 ...e-always-changes-kpatch-relying-on-s.patch | 26 +++++++++++++++++++
 kpatch.spec                                   |  9 ++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 0048-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch

diff --git a/0048-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch b/0048-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch
new file mode 100644
index 0000000..a1adb09
--- /dev/null
+++ b/0048-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 <caixiaomeng2@huawei.com>
+Date: Sat, 13 Jul 2024 14:53:06 +0800
+Subject: [PATCH] fix sssnic module always changes, kpatch relying on sssnic
+ problem
+
+---
+ kpatch-build/kpatch-cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kpatch-build/kpatch-cc b/kpatch-build/kpatch-cc
+index 80d310c..688d92b 100755
+--- a/kpatch-build/kpatch-cc
++++ b/kpatch-build/kpatch-cc
+@@ -49,7 +49,8 @@ if [[ "$TOOLCHAINCMD" =~ ^(.*-)?gcc$ ||
+ 				arch/powerpc/kernel/vdso64/*|\
+ 				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 91cb091..c245a5a 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -1,7 +1,7 @@
 Name:           kpatch
 Epoch:          1
 Version:        0.9.5
-Release:        9
+Release:        10
 Summary:        A Linux dynamic kernel patching infrastructure
 
 License:        GPLv2
@@ -60,6 +60,7 @@ Patch0044:0044-lookup-skip-finding-local-symbols-for-object-with-no.patch
 Patch0045:0045-backport-create-diff-object-add-support-for-.return_sites-sec.patch
 Patch0046:0046-create-diff-object-ignore-entsize-change-of-.return_.patch
 Patch0047:0047-lookup-skip-duplicate-local-symbol-table-check-for-f.patch
+Patch0048:0048-fix-sssnic-module-always-changes-kpatch-relying-on-s.patch
 
 BuildRequires:  gcc elfutils-libelf-devel kernel-devel git
 %ifarch ppc64le
@@ -123,6 +124,12 @@ popd
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Sat Jul 13 2024 caixiaomeng <caixiaomeng2@huawei.com> - 1:0.9.5-10
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:ignore sssnic module when building hotpatch to fix sssnic wrongly dependency of sssnic
+
 * Wed Mar 13 2024 peng.zou <peng.zou@shingroup.cn> - 1:0.9.5-9
 - Type:enhancement
 - ID:NA