The package rpms/supermin.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/supermin.git/commit/?id=87c3622fe....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit ac4b685403c9d39f315c31ab94bd07f619df9e8d
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Mar 4 13:32:40 2022 +0000
New upstream development version 5.3.2
diff --git a/sources b/sources
index 8c56431..3bc8f7e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (supermin-5.3.1.tar.gz) =
c904f62c46941cd7e1d19abd5e82491c46f40333faac4a131439cb2d95ec78ad38c227dadbbedd83317283b11d29d603fc65d2d5fe095d37bbd89e7e212f3e8a
-SHA512 (supermin-5.3.1.tar.gz.sig) =
e35f300a206316ab8379261318967330a01cd1b8edd63a4185eb9965c74370a4ddda1a93f8668ff5c6984a01e573d1a761d5f91e3382322e36d8853320993a11
+SHA512 (supermin-5.3.2.tar.gz) =
501731e9cce8bf1f4743eeff4af620813d466da10b664df037575a546b3b8e8697ed9e881dde7d3ba737e6a78536717c1823e22cdc1c92409db78d976a6678b5
+SHA512 (supermin-5.3.2.tar.gz.sig) =
5006481ab4c9a5ef5120654ac36fef3da634e03e0cacf4c27f44a5b37d7a906f3fdf911fde666a8f8dd08fce7e129399dbbb139d8e29c05a54dac9399ce31c9a
diff --git a/supermin.spec b/supermin.spec
index 64495c3..71fad00 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -30,8 +30,8 @@
Summary: Tool for creating supermin appliances
Name: supermin
-Version: 5.3.1
-Release: 5%{?dist}
+Version: 5.3.2
+Release: 1%{?dist}
License: GPLv2+
ExclusiveArch: %{kernel_arches}
@@ -179,6 +179,9 @@ make check || {
%changelog
+* Fri Mar 04 2022 Richard W.M. Jones <rjones(a)redhat.com> - 5.3.2-1
+- New upstream development version 5.3.2
+
* Fri Feb 04 2022 Richard W.M. Jones <rjones(a)redhat.com> - 5.3.1-5
- OCaml 4.13.1 rebuild to remove package notes
commit 767dca226a057b60fa522dab16c6d4adf272e999
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Mon Feb 28 13:07:25 2022 +0000
Fix link to dependency generator documentation
diff --git a/supermin.spec b/supermin.spec
index 60a47b3..64495c3 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -102,7 +102,7 @@ Requires: e2fsprogs-libs >= 1.42
Requires: findutils
# For automatic RPM dependency generation.
-# See:
http://www.rpm.org/wiki/PackagerDocs/DependencyGenerator
+# See:
https://rpm-software-management.github.io/rpm/manual/dependency_generator...
Source3: supermin.attr
Source4: supermin-find-requires
commit 13688555ee49c0c85c1da2d2de5acec4d8cb11b7
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Fri Feb 4 18:12:39 2022 +0000
OCaml 4.13.1 rebuild to remove package notes
diff --git a/supermin.spec b/supermin.spec
index 75f594c..60a47b3 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -1,3 +1,5 @@
+%undefine _package_note_flags
+
# On platforms and architectures that support it, the default is
# ‘--with dietlibc’.
#
@@ -29,7 +31,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
ExclusiveArch: %{kernel_arches}
@@ -177,6 +179,9 @@ make check || {
%changelog
+* Fri Feb 04 2022 Richard W.M. Jones <rjones(a)redhat.com> - 5.3.1-5
+- OCaml 4.13.1 rebuild to remove package notes
+
* Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.3.1-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit 304198ebcf00546558da6ceb12deb8e398b89a3b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jan 22 01:58:06 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/supermin.spec b/supermin.spec
index 2a5cdcf..75f594c 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -29,7 +29,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
ExclusiveArch: %{kernel_arches}
@@ -177,6 +177,9 @@ make check || {
%changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.3.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Wed Dec 01 2021 Richard W.M. Jones <rjones(a)redhat.com> - 5.3.1-3
- Further fix to ignore zfcpdump kernel on s390x
commit 80d74621ab2538066e92555d2d0f7314b527c898
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Dec 1 10:40:14 2021 +0000
Further fix to ignore zfcpdump kernel on s390x
diff --git a/0001-Ignore-zfcpdump-kernel-on-s390x.patch
b/0001-Ignore-zfcpdump-kernel-on-s390x.patch
index e3e4fb1..9876d68 100644
--- a/0001-Ignore-zfcpdump-kernel-on-s390x.patch
+++ b/0001-Ignore-zfcpdump-kernel-on-s390x.patch
@@ -1,7 +1,7 @@
From 9fbe476d4df0b01568d3668e6121cae7c779c8c7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones(a)redhat.com>
Date: Mon, 29 Nov 2021 14:40:15 +0000
-Subject: [PATCH] Ignore zfcpdump kernel on s390x
+Subject: [PATCH 1/2] Ignore zfcpdump kernel on s390x
Reported-by: Sebastian Mitterle
Thanks: Cornelia Huck
diff --git a/0002-Ignore-unbootable-kernels-in-lib-modules.patch
b/0002-Ignore-unbootable-kernels-in-lib-modules.patch
new file mode 100644
index 0000000..255ee8e
--- /dev/null
+++ b/0002-Ignore-unbootable-kernels-in-lib-modules.patch
@@ -0,0 +1,108 @@
+From f53868ce875fc17527696a85b48c67fefa3176e7 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones(a)redhat.com>
+Date: Wed, 1 Dec 2021 10:28:36 +0000
+Subject: [PATCH 2/2] Ignore unbootable kernels in /lib/modules
+
+The previous commit didn't ignore zfcpdump kernels if found in
+/lib/modules because we didn't apply the kernel filter to those paths.
+
+Also this commit cleans up the code in general, splitting up the
+multi-purpose "kernel_filter" function into two parts with clearer
+roles.
+
+Fixes: commit 9fbe476d4df0b01568d3668e6121cae7c779c8c7
+Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=2027375
+Reported-by: Yongkui Guo
+---
+ src/format_ext2_kernel.ml | 44 +++++++++++++++++++++++----------------
+ 1 file changed, 26 insertions(+), 18 deletions(-)
+
+diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml
+index ea69ade..79d636b 100644
+--- a/src/format_ext2_kernel.ml
++++ b/src/format_ext2_kernel.ml
+@@ -38,7 +38,7 @@ let rec build_kernel debug host_cpu copy_kernel kernel =
+ | None ->
+ if debug >= 1 then
+ printf "supermin: kernel: looking for kernels in /lib/modules/*/vmlinuz
...\n%!";
+- match find_kernel_from_lib_modules debug with
++ match find_kernel_from_lib_modules debug host_cpu with
+ | Some k -> k
+ | None ->
+ if debug >= 1 then
+@@ -89,10 +89,13 @@ and find_kernel_from_env_vars debug =
+ Some (kernel_env, kernel_name, kernel_version, modpath)
+ with Not_found -> None
+
+-and find_kernel_from_lib_modules debug =
++and find_kernel_from_lib_modules debug host_cpu =
++ let files = glob "/lib/modules/*/vmlinuz" [GLOB_NOSORT; GLOB_NOESCAPE] in
++ let files = Array.to_list files in
++
++ let files = ignore_unbootable_kernels host_cpu files in
++
+ let kernels =
+- let files = glob "/lib/modules/*/vmlinuz" [GLOB_NOSORT; GLOB_NOESCAPE] in
+- let files = Array.to_list files in
+ let kernels =
+ filter_map (
+ fun kernel_file ->
+@@ -114,22 +117,22 @@ and find_kernel_from_lib_modules debug =
+ | [] -> None
+
+ and find_kernel_from_boot debug host_cpu =
+- let is_arm =
+- String.length host_cpu >= 3 &&
+- host_cpu.[0] = 'a' && host_cpu.[1] = 'r' &&
host_cpu.[2] = 'm' in
+-
+ let all_files = Sys.readdir "/boot" in
+ let all_files = Array.to_list all_files in
+
+ (* In original: ls -1dvr /boot/vmlinuz-*.$arch* 2>/dev/null | grep -v xen *)
+ let patterns = patt_of_cpu host_cpu in
+- let files = kernel_filter patterns is_arm all_files in
++ let files = files_matching_globs patterns all_files in
++ let files = ignore_unbootable_kernels host_cpu files in
+
+ let files =
+ if files <> [] then files
+- else
++ else (
+ (* In original: ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen *)
+- kernel_filter ["vmlinu?-*"] is_arm all_files in
++ let files = files_matching_globs ["vmlinu?-*"] all_files in
++ let files = ignore_unbootable_kernels host_cpu files in
++ files
++ ) in
+
+ let files = List.sort (fun a b -> compare_version b a) files in
+ let kernels =
+@@ -148,13 +151,18 @@ and find_kernel_from_boot debug host_cpu =
+ | kernel :: _ -> Some kernel
+ | [] -> None
+
+-and kernel_filter patterns is_arm all_files =
+- let files =
+- List.filter
+- (fun filename ->
+- List.exists
+- (fun patt -> fnmatch patt filename [FNM_NOESCAPE]) patterns
+- ) all_files in
++and files_matching_globs patterns files =
++ List.filter
++ (fun filename ->
++ List.exists
++ (fun patt -> fnmatch patt filename [FNM_NOESCAPE]) patterns
++ ) files
++
++and ignore_unbootable_kernels host_cpu files =
++ let is_arm =
++ String.length host_cpu >= 3 &&
++ host_cpu.[0] = 'a' && host_cpu.[1] = 'r' &&
host_cpu.[2] = 'm' in
++
+ let files =
+ List.filter (fun filename -> find filename "xen" = -1) files in
+ let files =
+--
+2.32.0
+
diff --git a/supermin.spec b/supermin.spec
index 17a5c29..2a5cdcf 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -29,7 +29,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
ExclusiveArch: %{kernel_arches}
@@ -44,9 +44,9 @@ 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
+# Ignore zfcpdump kernel on s390x, upstream in 5.3.2
Patch0001: 0001-Ignore-zfcpdump-kernel-on-s390x.patch
+Patch0002: 0002-Ignore-unbootable-kernels-in-lib-modules.patch
BuildRequires: make
BuildRequires: /usr/bin/pod2man
@@ -177,6 +177,9 @@ make check || {
%changelog
+* Wed Dec 01 2021 Richard W.M. Jones <rjones(a)redhat.com> - 5.3.1-3
+- Further fix to ignore zfcpdump kernel on s390x
+
* Tue Nov 30 2021 Richard W.M. Jones <rjones(a)redhat.com> - 5.3.1-2
- Ignore zfcpdump kernel on s390x
commit 87c3622fef06d383714da9c45a8f46d6289dfb20
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Nov 30 11:02:04 2021 +0000
Work around incorrect kernel provides on RHEL 9 s390x
On RHEL 9 s390x, kernel incorrectly pulls in kernel-zfcpdump-core
https://bugzilla.redhat.com/show_bug.cgi?id=2027654
diff --git a/supermin.spec b/supermin.spec
index 29cf4cf..17a5c29 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -72,6 +72,14 @@ BuildRequires: gnupg2
# tests to not require these packages.
BuildRequires: augeas hivex kernel tar
+%if 0%{?rhel}
+%ifarch s390x
+# On RHEL 9 s390x, kernel incorrectly pulls in kernel-zfcpdump-core
+#
https://bugzilla.redhat.com/show_bug.cgi?id=2027654
+BuildRequires: kernel-core
+%endif
+%endif
+
# For complicated reasons, this is required so that
# /bin/kernel-install puts the kernel directly into /boot, instead of
# into a /boot/<machine-id> subdirectory (in Fedora >= 23). Read the
commit 8d0c6850b4205395ef03f6b7e296e56be5738dd8
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Tue Nov 30 09:01:52 2021 +0000
Ignore zfcpdump kernel on s390x
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(a)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 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 <rjones(a)redhat.com> - 5.3.1-2
+- Ignore zfcpdump kernel on s390x
+
* Thu Aug 26 2021 Richard W.M. Jones <rjones(a)redhat.com> - 5.3.1-1
- New upstream development version 5.3.1.