From a61cdc710c7a850e38c0b40753bd2ae841d749b1 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Wed, 22 Jan 2025 17:44:54 +0800 Subject: [PATCH 1/2] [BUG]update to kernel-4.18.0-553.36.1 to #IBJCJT update to kernel-4.18.0-553.36.1 for bugfix Signed-off-by: Zhao Hang --- download | 4 ++-- kernel.spec | 21 ++++++++++++------- ...es-causes-kernel-compilation-to-fail.patch | 11 ---------- 3 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/download b/download index 71defd0..a208285 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -c89daa6bd340684db954f2f03201f062 kernel-abi-stablelists-4.18.0-553.tar.bz2 +d19da46bc44b636726f1d0561aa56d9e kernel-abi-stablelists-4.18.0-553.tar.bz2 559191ff3ea6f1f91b7d06563f479e39 kernel-kabi-dw-4.18.0-553.tar.bz2 -aaeb58a117db1a96068f2c351df15a21 linux-4.18.0-553.34.1.el8_10.tar.xz +67a9425fb71c483023ea282f70a198e7 linux-4.18.0-553.36.1.el8_10.tar.xz diff --git a/kernel.spec b/kernel.spec index 5a290d6..4d075df 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). @@ -39,10 +38,10 @@ # define buildid .local %define specversion 4.18.0 -%define pkgrelease 553.34.1.el8_10 +%define pkgrelease 553.36.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.34.1%{anolis_release}%{?dist} +%define specrelease 553.36.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -545,7 +544,6 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1103,7 +1101,6 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch -%patch1000 -p0 -b .repair-dwarves-causes-kernel-compilation-to-fail # END OF PATCH APPLICATIONS @@ -2699,8 +2696,18 @@ fi # # %changelog -* Thu Jan 09 2025 Xiaoping Liu - 4.18.0-553.34.1.0.1 -- kernel:repair dwarves causes kernel compilation to fail +* Thu Jan 09 2025 Denys Vlasenko [4.18.0-553.36.1.el8_10] +- cpufreq: intel_pstate: Support Emerald Rapids OOB mode (David Arcari) [RHEL-59649] +- scsi: st: New session only when Unit Attention for new tape (John Meneghini) [RHEL-28790] +- scsi: st: Add MTIOCGET and MTLOAD to ioctls allowed after device reset (John Meneghini) [RHEL-28790] +- scsi: st: Don't modify unknown block number in MTIOCGET (John Meneghini) [RHEL-28790] +- Reapply "scsi: st: Add third party poweron reset handling" (John Meneghini) [RHEL-28790] + +* Thu Jan 02 2025 Denys Vlasenko [4.18.0-553.35.1.el8_10] +- samples: pktgen: allow to specify destination port (Hangbin Liu) [RHEL-56480] +- samples: pktgen: add some helper functions for port parsing (Hangbin Liu) [RHEL-56480] +- scsi: storvsc: Do not flag MAINTENANCE_IN return of SRB_STATUS_DATA_OVERRUN as an error (Cathy Avery) [RHEL-71396] +- scsi: storvsc: Handle additional SRB status values (Cathy Avery) [RHEL-71396] * Thu Dec 12 2024 Denys Vlasenko [4.18.0-553.34.1.el8_10] - mptcp: cope racing subflow creation in mptcp_rcv_space_adjust (Davide Caratti) [RHEL-69667] {CVE-2024-53122} diff --git a/repair-dwarves-causes-kernel-compilation-to-fail.patch b/repair-dwarves-causes-kernel-compilation-to-fail.patch deleted file mode 100644 index 74f4020..0000000 --- a/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 -- Gitee From c718e79f44c90c3cf38275316358a9a9b48dcdf8 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 --- kernel.spec | 8 +++++++- ...ir-dwarves-causes-kernel-compilation-to-fail.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 repair-dwarves-causes-kernel-compilation-to-fail.patch diff --git a/kernel.spec b/kernel.spec index 4d075df..23dec08 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). @@ -41,7 +42,7 @@ %define pkgrelease 553.36.1.el8_10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 553.36.1%{?dist} +%define specrelease 553.36.1%{anolis_release}%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -544,6 +545,7 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch +Patch1000: repair-dwarves-causes-kernel-compilation-to-fail.patch # END OF PATCH DEFINITIONS @@ -1101,6 +1103,7 @@ mv linux-%{specversion}-%{pkgrelease} linux-%{KVERREL} cd linux-%{KVERREL} ApplyOptionalPatch linux-kernel-test.patch +%patch1000 -p0 -b .repair-dwarves-causes-kernel-compilation-to-fail # END OF PATCH APPLICATIONS @@ -2696,6 +2699,9 @@ fi # # %changelog +* Wed Jan 22 2025 Xiaoping Liu - 4.18.0-553.36.1.0.1 +- kernel:repair dwarves causes kernel compilation to fail + * Thu Jan 09 2025 Denys Vlasenko [4.18.0-553.36.1.el8_10] - cpufreq: intel_pstate: Support Emerald Rapids OOB mode (David Arcari) [RHEL-59649] - scsi: st: New session only when Unit Attention for new tape (John Meneghini) [RHEL-28790] diff --git a/repair-dwarves-causes-kernel-compilation-to-fail.patch b/repair-dwarves-causes-kernel-compilation-to-fail.patch new file mode 100644 index 0000000..74f4020 --- /dev/null +++ b/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 -- Gitee