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" +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 d771cce..29cf4cf 100644 --- a/supermin.spec +++ b/supermin.spec @@ -29,7 +29,7 @@ Summary: Tool for creating supermin appliances Name: supermin Version: 5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ ExclusiveArch: %{kernel_arches} @@ -44,6 +44,10 @@ Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{nam # Keyring used to verify tarball signature. Source2: libguestfs.keyring +# Ignore zfcpdump kernel on s390x +# Upstream commit: 9fbe476d4df0b01568d3668e6121cae7c779c8c7 +Patch0001: 0001-Ignore-zfcpdump-kernel-on-s390x.patch + BuildRequires: make BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2html @@ -165,6 +169,9 @@ make check || { %changelog +* Tue Nov 30 2021 Richard W.M. Jones - 5.3.1-2 +- Ignore zfcpdump kernel on s390x + * Thu Aug 26 2021 Richard W.M. Jones - 5.3.1-1 - New upstream development version 5.3.1.