Ignore zfcpdump kernel on s390x

resolves: rhbz#2027375
This commit is contained in:
Richard W.M. Jones 2021-11-30 09:01:52 +00:00
parent 09649b7478
commit 382616de66
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From 9fbe476d4df0b01568d3668e6121cae7c779c8c7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Nov 2021 14:40:15 +0000
Subject: [PATCH] Ignore zfcpdump kernel on s390x
Reported-by: Sebastian Mitterle
Thanks: Cornelia Huck
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2027375
---
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 3be4413..ea69ade 100644
--- a/src/format_ext2_kernel.ml
+++ b/src/format_ext2_kernel.ml
@@ -157,6 +157,8 @@ and kernel_filter patterns is_arm all_files =
) all_files in
let 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 =
if not is_arm then files
else (
--
2.32.0

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: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ License: GPLv2+
ExclusiveArch: %{kernel_arches} ExclusiveArch: %{kernel_arches}
@ -47,6 +47,10 @@ Source2: libguestfs.keyring
# Upstream fix for stat field overflow on armv7. # Upstream fix for stat field overflow on armv7.
Patch1: 0001-Open-Unix.LargeFile-to-avoid-lstat-Value-too-large-f.patch Patch1: 0001-Open-Unix.LargeFile-to-avoid-lstat-Value-too-large-f.patch
# Ignore zfcpdump kernel on s390x
# Upstream commit: 9fbe476d4df0b01568d3668e6121cae7c779c8c7
Patch2: 0001-Ignore-zfcpdump-kernel-on-s390x.patch
BuildRequires: make BuildRequires: make
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2html BuildRequires: /usr/bin/pod2html
@ -168,6 +172,10 @@ make check || {
%changelog %changelog
* Tue Nov 30 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-5
- Ignore zfcpdump kernel on s390x
resolves: rhbz#2027375
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.1-4 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688