From 382616de663a4c39c904bdd52866d186001b3eea Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Nov 2021 09:01:52 +0000
Subject: [PATCH] Ignore zfcpdump kernel on s390x

  resolves: rhbz#2027375
---
 0001-Ignore-zfcpdump-kernel-on-s390x.patch | 28 ++++++++++++++++++++++
 supermin.spec                              | 10 +++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 0001-Ignore-zfcpdump-kernel-on-s390x.patch

diff --git a/0001-Ignore-zfcpdump-kernel-on-s390x.patch b/0001-Ignore-zfcpdump-kernel-on-s390x.patch
new file mode 100644
index 0000000..e3e4fb1
--- /dev/null
+++ b/0001-Ignore-zfcpdump-kernel-on-s390x.patch
@@ -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
+
diff --git a/supermin.spec b/supermin.spec
index f37982e..56900d6 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -29,7 +29,7 @@
 Summary:       Tool for creating supermin appliances
 Name:          supermin
 Version:       5.2.1
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPLv2+
 
 ExclusiveArch: %{kernel_arches}
@@ -47,6 +47,10 @@ Source2:       libguestfs.keyring
 # Upstream fix for stat field overflow on armv7.
 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: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2html
@@ -168,6 +172,10 @@ make check || {
 
 
 %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
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688