import supermin-5.2.1-8.el9

This commit is contained in:
CentOS Sources 2022-09-27 09:32:18 -04:00 committed by Stepan Oksanichenko
parent 532364686d
commit d50ea7fe91
5 changed files with 54 additions and 15 deletions

View File

@ -1,7 +1,7 @@
From fd9f17c7eb63979af882533a0d234bfc8ca42de3 Mon Sep 17 00:00:00 2001 From 90251e796a14cd7ce77ad7f07fd1fbe5d3a43664 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 1 Feb 2021 10:07:02 +0000 Date: Mon, 1 Feb 2021 10:07:02 +0000
Subject: [PATCH] Open Unix.LargeFile to avoid "lstat: Value too large for Subject: [PATCH 1/4] Open Unix.LargeFile to avoid "lstat: Value too large for
defined data type". defined data type".
On 32 bit platforms, because OCaml native ints are limited to 31 bits, On 32 bit platforms, because OCaml native ints are limited to 31 bits,
@ -176,5 +176,5 @@ index b25df88..f5990ef 100644
let (+^) = Int64.add let (+^) = Int64.add
-- --
2.29.0.rc2 2.31.1

View File

@ -1,7 +1,7 @@
From 9fbe476d4df0b01568d3668e6121cae7c779c8c7 Mon Sep 17 00:00:00 2001 From 629069fb8c4101d21ec7883e2a137cb280fbe448 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Nov 2021 14:40:15 +0000 Date: Mon, 29 Nov 2021 14:40:15 +0000
Subject: [PATCH 1/2] Ignore zfcpdump kernel on s390x Subject: [PATCH 2/4] Ignore zfcpdump kernel on s390x
Reported-by: Sebastian Mitterle Reported-by: Sebastian Mitterle
Thanks: Cornelia Huck Thanks: Cornelia Huck
@ -24,5 +24,5 @@ index 3be4413..ea69ade 100644
if not is_arm then files if not is_arm then files
else ( else (
-- --
2.32.0 2.31.1

View File

@ -1,7 +1,7 @@
From f53868ce875fc17527696a85b48c67fefa3176e7 Mon Sep 17 00:00:00 2001 From 664ef10ae4fe0f6070f43f2cf1efd1a05d5514d9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 1 Dec 2021 10:28:36 +0000 Date: Wed, 1 Dec 2021 10:28:36 +0000
Subject: [PATCH 2/2] Ignore unbootable kernels in /lib/modules Subject: [PATCH 3/4] Ignore unbootable kernels in /lib/modules
The previous commit didn't ignore zfcpdump kernels if found in The previous commit didn't ignore zfcpdump kernels if found in
/lib/modules because we didn't apply the kernel filter to those paths. /lib/modules because we didn't apply the kernel filter to those paths.
@ -104,5 +104,5 @@ index ea69ade..79d636b 100644
List.filter (fun filename -> find filename "xen" = -1) files in List.filter (fun filename -> find filename "xen" = -1) files in
let files = let files =
-- --
2.32.0 2.31.1

View File

@ -0,0 +1,34 @@
From 0b3ae5be86025f4902cb558f377e446baf49bc6d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 28 Feb 2022 16:54:33 -0500
Subject: [PATCH 4/4] Ignore debug kernels
On RHEL 8.2 with RT, these kernels are not bootable. The kernel in
that instance was called
/lib/modules/4.18.0-193.70.1.rt13.120.el8_2.x86_64+debug/vmlinuz
installed from the package
kernel-rt-debug-core-4.18.0-193.70.1.rt13.120.el8_2.x86_64
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2051332
(cherry picked from commit c44d685e662e001f5fe70f0a98d0964cb561e1ec)
(cherry picked from commit 7f91755424299fde5dec1af83c7c99b107a94a9d)
---
src/format_ext2_kernel.ml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml
index 79d636b..c592703 100644
--- a/src/format_ext2_kernel.ml
+++ b/src/format_ext2_kernel.ml
@@ -167,6 +167,8 @@ and ignore_unbootable_kernels host_cpu files =
List.filter (fun filename -> find filename "xen" = -1) files in
let files =
List.filter (fun filename -> find filename "zfcpdump" = -1) files in
+ let files =
+ List.filter (fun filename -> find filename "+debug" = -1) files in
let files =
if not is_arm then files
else (
--
2.31.1

View File

@ -29,7 +29,7 @@
Summary: Tool for creating supermin appliances Summary: Tool for creating supermin appliances
Name: supermin Name: supermin
Version: 5.2.1 Version: 5.2.1
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2+ License: GPLv2+
ExclusiveArch: %{kernel_arches} ExclusiveArch: %{kernel_arches}
@ -44,12 +44,13 @@ Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{nam
# Keyring used to verify tarball signature. # Keyring used to verify tarball signature.
Source2: libguestfs.keyring Source2: libguestfs.keyring
# Upstream fix for stat field overflow on armv7. # Patches are stored here:
Patch1: 0001-Open-Unix.LargeFile-to-avoid-lstat-Value-too-large-f.patch # https://github.com/libguestfs/supermin/tree/rhel-9.1
# Ignore zfcpdump kernel on s390x, upstream in 5.3.2 Patch0001: 0001-Open-Unix.LargeFile-to-avoid-lstat-Value-too-large-f.patch
Patch2: 0001-Ignore-zfcpdump-kernel-on-s390x.patch Patch0002: 0002-Ignore-zfcpdump-kernel-on-s390x.patch
Patch3: 0002-Ignore-unbootable-kernels-in-lib-modules.patch Patch0003: 0003-Ignore-unbootable-kernels-in-lib-modules.patch
Patch0004: 0004-Ignore-debug-kernels.patch
BuildRequires: make BuildRequires: make
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
@ -180,6 +181,10 @@ make check || {
%changelog %changelog
* Tue Mar 15 2022 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-8
- Fix ignore +debug kernels when choosing a kernel to boot
resolves: rhbz#2059397
* Wed Dec 01 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-7 * Wed Dec 01 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-7
- Further fix to ignore zfcpdump kernel on s390x - Further fix to ignore zfcpdump kernel on s390x