!152 修复6.6内核引入的.export_symbol段导致部分场景编译失败
From: @pshysimon Reviewed-by: @hubin95 Signed-off-by: @hubin95
This commit is contained in:
commit
b94cbbdf8e
@ -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
|
||||||
|
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Name: kpatch
|
Name: kpatch
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.9.9
|
Version: 0.9.9
|
||||||
Release: 9
|
Release: 10
|
||||||
Summary: A Linux dynamic kernel patching infrastructure
|
Summary: A Linux dynamic kernel patching infrastructure
|
||||||
|
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -60,6 +60,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
|
Patch9004:huawei-fix-function-ptr-relocation-and-strip-.BTF-section-f.patch
|
||||||
Patch9005:huawei-adapt-arm64-dynamic-ftrace-call-with-2-nops.patch
|
Patch9005:huawei-adapt-arm64-dynamic-ftrace-call-with-2-nops.patch
|
||||||
Patch9006:huawei-ignore-initcall5-section-to-adapt-6.6-kernel.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
|
BuildRequires: gcc elfutils-libelf-devel kernel-devel git
|
||||||
%ifarch ppc64le
|
%ifarch ppc64le
|
||||||
@ -123,6 +124,12 @@ popd
|
|||||||
%{_mandir}/man1/*.1.gz
|
%{_mandir}/man1/*.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 13 2025 caixiaomeng <caixiaomeng2@huawei.com> - 1:0.9.9-10
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:remove .export_symbol section newly added in 6.6 kernel to avoid compile error
|
||||||
|
|
||||||
* Fri May 24 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 1:0.9.9-9
|
* Fri May 24 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 1:0.9.9-9
|
||||||
- Type:update
|
- Type:update
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user