From 03b9f697949f09315e5585fac96e68b10ead8e99 Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Tue, 27 May 2025 19:08:38 +0800 Subject: [PATCH] roll back patch huawei-remove-.export_symbol-section-to-avoid-compile-error.patch Signed-off-by: jinsaihang --- ...ymbol-section-to-avoid-compile-error.patch | 27 ------------------- kpatch.spec | 11 +++++--- 2 files changed, 8 insertions(+), 30 deletions(-) delete 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 deleted file mode 100644 index 5991f2c..0000000 --- a/huawei-remove-.export_symbol-section-to-avoid-compile-error.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 273d0d8a3912845ac34501dc83304958d9cf267f Mon Sep 17 00:00:00 2001 -From: 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 5b87e5d..a0378d7 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,7 +1,7 @@ Name: kpatch Epoch: 1 Version: 0.9.9 -Release: 12 +Release: 13 Summary: A Linux dynamic kernel patching infrastructure License: GPLv2 @@ -61,8 +61,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 -Patch9008:huawei-ignore-the-change-of-the-hibifur-module.patch +Patch9007:huawei-ignore-the-change-of-the-hibifur-module.patch BuildRequires: gcc elfutils-libelf-devel kernel-devel git %ifarch ppc64le @@ -126,6 +125,12 @@ popd %{_mandir}/man1/*.1.gz %changelog +* Tue May 27 2025 jinsaihang - 1:0.9.9-13 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:roll back patch huawei-remove-.export_symbol-section-to-avoid-compile-error.patch + * Thu Apr 17 2025 jinsaihang - 1:0.9.9-12 - Type:bugfix - CVE:NA -- Gitee