From 4983f039cd867300cd1ab96b06bd4551f1141b34 Mon Sep 17 00:00:00 2001
From: PhsySimon <caixiaomeng2@huawei.com>
Date: Mon, 13 Jan 2025 10:15:30 +0800
Subject: [PATCH] remove .export_symbol to avoid compile error

---
 ...ymbol-section-to-avoid-compile-error.patch | 27 +++++++++++++++++++
 kpatch.spec                                   |  9 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 huawei-remove-.export_symbol-section-to-avoid-compile-error.patch

diff --git a/huawei-remove-.export_symbol-section-to-avoid-compile-error.patch b/huawei-remove-.export_symbol-section-to-avoid-compile-error.patch
new file mode 100644
index 0000000..5991f2c
--- /dev/null
+++ b/huawei-remove-.export_symbol-section-to-avoid-compile-error.patch
@@ -0,0 +1,27 @@
+From 273d0d8a3912845ac34501dc83304958d9cf267f Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 30 Sep 2024 16:11:06 +0800
+Subject: [PATCH] remove .export_symbol section to avoid compile error
+
+---
+ kpatch-build/kpatch-build | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
+index 886a753..b927555 100755
+--- a/kpatch-build/kpatch-build
++++ b/kpatch-build/kpatch-build
+@@ -1543,6 +1543,9 @@ KPATCH_LDFLAGS="$KPATCH_LDFLAGS" \
+ CROSS_COMPILE="$CROSS_COMPILE"
+ save_env
+ 
++objcopy --remove-section=.export_symbol "$TEMPDIR/patch/output.o" "$TEMPDIR/patch/output_tmp.o"
++mv "$TEMPDIR/patch/output_tmp.o" "$TEMPDIR/patch/output.o"
++
+ KBUILD_MODPOST_WARN=1 make "${MAKEVARS[@]}" 2>&1 | logger || die
+ strip -g "$TEMPDIR/patch/$MODNAME.ko"
+ 
+-- 
+2.33.0
+
+
diff --git a/kpatch.spec b/kpatch.spec
index fbc548a..41d25fc 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -1,7 +1,7 @@
 Name:           kpatch
 Epoch:          1
 Version:        0.9.9
-Release:        8
+Release:        9
 Summary:        A Linux dynamic kernel patching infrastructure
 
 License:        GPLv2
@@ -59,6 +59,7 @@ Patch9003:huawei-adapt-kpatch-to-6.6-kernel-and-fix-bundle-symbols-ch.patch
 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
 
 BuildRequires:  gcc elfutils-libelf-devel kernel-devel git
 %ifarch ppc64le
@@ -122,6 +123,12 @@ popd
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon Jan 13 2024 caixiaomeng <caixiaomeng2@huawei.com> - 1:0.0.9-9
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:remove .export_symbol section newly added in 6.6 kernel to avoid compile error
+
 * Wed Jun 12 2024 peng.zou <peng.zou@shingroup.cn> - 1:0.9.9-8
 - Type:enhancement
 - ID:NA
-- 
Gitee