From fc36112f4953f0eee0251652587ebc32a6dc5d26 Mon Sep 17 00:00:00 2001 From: PengLAI Code Date: Thu, 6 Aug 2026 17:55:21 +0800 Subject: [PATCH 1/2] update to kernel-4.18.0-553.153.1 Assisted-by: Qoder:Ultimate --- ...ves-causes-kernel-compilation-to-fail.patch | 11 ----------- download | 6 +++--- kernel.spec | 18 +++++++++++------- 3 files changed, 14 insertions(+), 21 deletions(-) delete mode 100644 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch b/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch deleted file mode 100644 index 74f4020..0000000 --- a/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2022-10-07 22:45:37.000000000 +0800 -+++ Makefile 2023-02-22 15:37:33.069118145 +0800 -@@ -378,7 +378,7 @@ - STRIP = $(CROSS_COMPILE)strip - OBJCOPY = $(CROSS_COMPILE)objcopy - OBJDUMP = $(CROSS_COMPILE)objdump --PAHOLE = pahole -+PAHOLE = pahole --skip_encoding_btf_enum64 - RESOLVE_BTFIDS = $(objtree)/tools/bpf/resolve_btfids/resolve_btfids - LEX = flex - YACC = bison diff --git a/download b/download index 4717363..912eee2 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -f10315914f9b6efe2b95338f4e1524ac kernel-abi-stablelists-4.18.0-553.tar.bz2 -d56d7d10b881bb248b3b852a40c995bd kernel-kabi-dw-4.18.0-553.tar.bz2 -eb15a327b9a9b960964ad03c52b12935 linux-4.18.0-553.151.1.el8_10.tar.xz +3bcff86dfab6ac01f8a60ac9e07a66ec kernel-abi-stablelists-4.18.0-553.tar.bz2 +38bca688d0f4aada6fc494575381129c kernel-kabi-dw-4.18.0-553.tar.bz2 +a7c29bc83c881047179b837262b92805 linux-4.18.0-553.153.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index e4a8a01..a9b5369 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,6 +1,5 @@ # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} -%define anolis_release .0.1 # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio # compression for rpms (xz, level 2). @@ -50,10 +49,10 @@ # define buildid .local %define specversion 4.18.0 -%define pkgrelease 553.151.1.el8_10 +%define pkgrelease 553.153.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.151.1%{anolis_release}%{?dist} +%define specrelease 553.153.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -562,7 +561,6 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1120,7 +1118,7 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch -%patch1000 -p0 -b .1000-repair-dwarves-causes-kernel-compilation-to-fail + # END OF PATCH APPLICATIONS # Any further pre-build tree manipulations happen here. @@ -2725,8 +2723,14 @@ fi # # %changelog -* Wed Aug 05 2026 Xiaoping Liu - 4.18.0-553.151.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail (lxp01404969@alibaba-inc.com) +* Wed Aug 05 2026 CKI KWF Bot [4.18.0-553.153.1.el8_10] +- scsi: storvsc: Handle PERSISTENT_RESERVE_IN truncation for Hyper-V vFC (Vitaly Kuznetsov) [RHEL-188270] +- scsi: storvsc: Process unsupported MODE_SENSE_10 (Vitaly Kuznetsov) [RHEL-188270] +- x86/CPU/AMD: Prevent improper isolation of shared resources in Zen2's op cache (Dennis Chen) [RHEL-188786] {CVE-2025-54518} + +* Tue Aug 04 2026 CKI KWF Bot [4.18.0-553.152.1.el8_10] +- gfs2: page poisoning fix (CKI Backport Bot) [RHEL-214099] +- bpf: Fix combination of jit blinding and pointers to bpf subprogs. (Viktor Malik) [RHEL-191844] * Mon Aug 03 2026 CKI KWF Bot [4.18.0-553.151.1.el8_10] - net: dns_resolver: allow shorter names in dns_query() (Paulo Alcantara) [RHEL-213976] -- Gitee From 8788dfedca6b18e74f56849f2f3f1ce02b211560 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Wed, 22 Feb 2023 15:53:19 +0800 Subject: [PATCH 2/2] kernel:repair dwarves causes kernel compilation to fail (cherry picked from commit da3c29d611aaaa03f6ad31d3aabadfd90b0b40cf) (cherry picked from commit 89ce1e6cc1ffe2f7586b816792bc58aa9711228d) --- ...ir-dwarves-causes-kernel-compilation-to-fail.patch | 11 +++++++++++ kernel.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch b/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch new file mode 100644 index 0000000..74f4020 --- /dev/null +++ b/1000-repair-dwarves-causes-kernel-compilation-to-fail.patch @@ -0,0 +1,11 @@ +--- Makefile.orig 2022-10-07 22:45:37.000000000 +0800 ++++ Makefile 2023-02-22 15:37:33.069118145 +0800 +@@ -378,7 +378,7 @@ + STRIP = $(CROSS_COMPILE)strip + OBJCOPY = $(CROSS_COMPILE)objcopy + OBJDUMP = $(CROSS_COMPILE)objdump +-PAHOLE = pahole ++PAHOLE = pahole --skip_encoding_btf_enum64 + RESOLVE_BTFIDS = $(objtree)/tools/bpf/resolve_btfids/resolve_btfids + LEX = flex + YACC = bison diff --git a/kernel.spec b/kernel.spec index a9b5369..64ab0d7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,5 +1,6 @@ # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} +%define anolis_release .0.1 # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio # compression for rpms (xz, level 2). @@ -52,7 +53,7 @@ %define pkgrelease 553.153.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.153.1%{?dist} +%define specrelease 553.153.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -561,6 +562,7 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch +Patch1000: 1000-repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1118,7 +1120,7 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch - +%patch1000 -p0 -b .1000-repair-dwarves-causes-kernel-compilation-to-fail # END OF PATCH APPLICATIONS # Any further pre-build tree manipulations happen here. @@ -2723,6 +2725,9 @@ fi # # %changelog +* Thu Aug 06 2026 Xiaoping Liu - 4.18.0-553.153.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail (lxp01404969@alibaba-inc.com) + * Wed Aug 05 2026 CKI KWF Bot [4.18.0-553.153.1.el8_10] - scsi: storvsc: Handle PERSISTENT_RESERVE_IN truncation for Hyper-V vFC (Vitaly Kuznetsov) [RHEL-188270] - scsi: storvsc: Process unsupported MODE_SENSE_10 (Vitaly Kuznetsov) [RHEL-188270] -- Gitee