From 9d41a807c04b2bf3a4bd76461222efe4af962ae2 Mon Sep 17 00:00:00 2001 From: Lichen Liu Date: Thu, 9 Jan 2025 20:21:31 +0800 Subject: [PATCH] makedumpfile: support kernel 6.12 Upstream: RHEL-ONLY Resolves: https://issues.redhat.com/browse/RHEL-69102 Signed-off-by: Lichen Liu --- 0001-makedumpfile-support-kernel-6.12.0.patch | 29 +++++++++++++++++++ makedumpfile.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-makedumpfile-support-kernel-6.12.0.patch diff --git a/0001-makedumpfile-support-kernel-6.12.0.patch b/0001-makedumpfile-support-kernel-6.12.0.patch new file mode 100644 index 0000000..0b77e7d --- /dev/null +++ b/0001-makedumpfile-support-kernel-6.12.0.patch @@ -0,0 +1,29 @@ +From 9a341d02a1610622919464833f5cddd9f93e5629 Mon Sep 17 00:00:00 2001 +From: Lichen Liu +Date: Thu, 9 Jan 2025 20:18:32 +0800 +Subject: [PATCH] makedumpfile: support kernel 6.12.0 + +Upstream: RHEL-ONLY +Resolves: https://issues.redhat.com/browse/RHEL-69102 + +Signed-off-by: Lichen Liu +--- + makedumpfile.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makedumpfile.h b/makedumpfile.h +index 2b3495e..e2367fc 100644 +--- a/makedumpfile.h ++++ b/makedumpfile.h +@@ -497,7 +497,7 @@ do { \ + #define KVER_MIN_SHIFT 16 + #define KERNEL_VERSION(x,y,z) (((x) << KVER_MAJ_SHIFT) | ((y) << KVER_MIN_SHIFT) | (z)) + #define OLDEST_VERSION KERNEL_VERSION(2, 6, 15) /* linux-2.6.15 */ +-#define LATEST_VERSION KERNEL_VERSION(6, 11, 4) /* linux-6.11.4 */ ++#define LATEST_VERSION KERNEL_VERSION(6, 12, 0) /* linux-6.11.4 */ + + /* + * for printk caller_id support +-- +2.47.0 + diff --git a/makedumpfile.spec b/makedumpfile.spec index 1d17847..9b3422b 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -3,13 +3,15 @@ Name: makedumpfile Version: 1.7.6 Summary: make a small dumpfile of kdump -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-only URL: https://github.com/makedumpfile/makedumpfile Source0: https://github.com/makedumpfile/makedumpfile/archive/%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/lucchouina/eppic/archive/%{eppic_ver}/eppic-%{eppic_shortver}.tar.gz +Patch0: 0001-makedumpfile-support-kernel-6.12.0.patch + Conflicts: kexec-tools < 2.0.28-5 BuildRequires: make BuildRequires: gcc @@ -58,6 +60,9 @@ install -m 755 -D eppic_makedumpfile.so %{buildroot}/%{_libdir}/eppic_makedumpfi %license COPYING %changelog +* Thu Jan 09 2025 Lichen Liu - 1.7.6-3 +- Add support for kernel 6.12.0 + * Tue Oct 29 2024 Troy Dawson - 1.7.6-2 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018