From 09f8677bca73d4c361df866a365542a039e37b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 14 Nov 2025 09:14:49 +0000 Subject: [PATCH 1/4] - rebased to 2.39.0 (rhbz#2403755) --- s390utils-2.38.0-fedora.patch | 0 s390utils-2.39.0-fedora.patch | 63 +++++++++++++++++++++++++++++++++++ s390utils.spec | 20 +++++++---- sources | 4 +-- 4 files changed, 79 insertions(+), 8 deletions(-) delete mode 100644 s390utils-2.38.0-fedora.patch create mode 100644 s390utils-2.39.0-fedora.patch diff --git a/s390utils-2.38.0-fedora.patch b/s390utils-2.38.0-fedora.patch deleted file mode 100644 index e69de29..0000000 diff --git a/s390utils-2.39.0-fedora.patch b/s390utils-2.39.0-fedora.patch new file mode 100644 index 0000000..f6f0d44 --- /dev/null +++ b/s390utils-2.39.0-fedora.patch @@ -0,0 +1,63 @@ +From 6bf9a8579cc184e64ab54e08073280ad005d50f6 Mon Sep 17 00:00:00 2001 +From: Peter Jin +Date: Wed, 1 Oct 2025 15:02:10 -0400 +Subject: [PATCH 1/2] udev/rules.d: make virtio-blk devices non-rotational +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Performance measurements turned out that in certain situations the +paging/swap logic turns on the rotational feature for block devices. In the +past, this feature has been disabled for DASD devices. FCP and NVMe devices +are considered non-rotational by default (or exposed by the storage server). +Because those are the backing devices on Linux on Z/LinuxONE instances, +ensure that virtio-blk devices are always non-rotational. + +Signed-off-by: Peter Jin +Signed-off-by: Jan Höppner +(cherry picked from commit 82f8c137e1881577d89309223f6d459361c671dd) +--- + etc/udev/rules.d/59-virtio-blk.rules | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 etc/udev/rules.d/59-virtio-blk.rules + +diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules +new file mode 100644 +index 00000000..2e3c13f7 +--- /dev/null ++++ b/etc/udev/rules.d/59-virtio-blk.rules +@@ -0,0 +1 @@ ++SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" +-- +2.51.1 + + +From 6e854376073b2907301310b1110f1fc6e02f0dc5 Mon Sep 17 00:00:00 2001 +From: Peter Jin +Date: Wed, 1 Oct 2025 15:09:49 -0400 +Subject: [PATCH 2/2] udev/rules.d: Set default io scheduler to 'none' for + virtio-blk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use 'none' as default io scheduler for virtio-blk devices. Performance +improvements for multi-queue setups and to reduce CPU consumption. + +Signed-off-by: Peter Jin +Signed-off-by: Jan Höppner +(cherry picked from commit 6ee5ffef91cb4157079fecb89bf42aa41e81e801) +--- + etc/udev/rules.d/59-virtio-blk.rules | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules +index 2e3c13f7..ca6e1c4d 100644 +--- a/etc/udev/rules.d/59-virtio-blk.rules ++++ b/etc/udev/rules.d/59-virtio-blk.rules +@@ -1 +1,2 @@ + SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" ++SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/scheduler", ATTR{queue/scheduler}="none" +-- +2.51.1 + diff --git a/s390utils.spec b/s390utils.spec index d6235bc..026c593 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -16,8 +16,8 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.38.0 -Release: 2%{?dist} +Version: 2.39.0 +Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later) # @@ -74,7 +74,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -#Patch100: s390utils-%%{version}-fedora.patch +Patch100: s390utils-%%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -207,6 +207,7 @@ fi # move tools to searchable dir mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image %{buildroot}%{_bindir} +mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image.1 %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}{/boot,%{_udevrulesdir},%{_sysconfdir}/{profile.d,sysconfig},%{_prefix}/lib/modules-load.d} install -p -m 644 zipl/boot/tape0.bin %{buildroot}/boot/tape0 @@ -256,10 +257,10 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf # install systemd sysusers and tmpfiles mkdir -p %{buildroot}{%{_sysusersdir},%{_tmpfilesdir}}/ for f in s390utils-*.conf.usr; do - install -p $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f) + install -p -m 644 $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f) done for f in s390utils-*.conf.tmp; do - install -p $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f) + install -p -m 644 $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f) done %endif @@ -331,6 +332,7 @@ License: MIT Summary: S390 core tools Provides: s390-tools-core = %{epoch}:%{version}-%{release} Requires: coreutils +Requires: makedumpfile %{?systemd_requires} # BRs are covered via the base package @@ -406,6 +408,7 @@ This package provides minimal set of tools needed to system to boot. %{_udevrulesdir}/56-dasd.rules %{_udevrulesdir}/56-zfcp.rules %{_udevrulesdir}/59-dasd.rules +%{_udevrulesdir}/59-virtio-blk.rules %{_udevrulesdir}/60-readahead.rules %{_udevrulesdir}/81-ccw.rules %{_udevrulesdir}/81-dpm.rules @@ -639,9 +642,9 @@ For more information refer to the following publications: %{_bindir}/cpacfinfo %{_bindir}/dump2tar %{_bindir}/genprotimg +%{_bindir}/mk-s390image %{_bindir}/pvapconfig %{_bindir}/pvimg -%{_bindir}/mk-s390image %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvsecret @@ -674,6 +677,7 @@ For more information refer to the following publications: %{_mandir}/man1/cpacfinfo.1* %{_mandir}/man1/dump2tar.1* %{_mandir}/man1/genprotimg.1* +%{_mandir}/man1/mk-s390image.1* %{_mandir}/man1/pvapconfig.1* %{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest-check.1* @@ -960,6 +964,7 @@ fi %{_mandir}/man1/ts-shell.1* %{_mandir}/man7/af_iucv.7* %{_mandir}/man8/chiucvallow.8* +%{_mandir}/man8/lsiucvallow.8* %{_mandir}/man9/hvc_iucv.9* %{_unitdir}/iucvtty-login@.service %{_unitdir}/ttyrun-getty@.service @@ -1124,6 +1129,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Thu Nov 13 2025 Dan Horák - 2:2.39.0-1 +- rebased to 2.39.0 (rhbz#2403755) + * Fri Jul 25 2025 Fedora Release Engineering - 2:2.38.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 16b71cb..17deb64 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.38.0.tar.gz) = 9ca9393e9deeab5c1df5e9eaa3c12e340917ffd5fe07d9a09087d6488d8e2ec0a136805650830d128595854b818a1da94151003e15954e556ba373b226a7369e -SHA512 (s390-tools-2.38.0-rust-vendor.tar.xz) = c55d2870ad9f90333de2536e7921951185746f0972d5d488bf317b56e754525e4dbd0f63d547229197199b51d41b7032172b6ba7ffacd9a96a01dbd13b9c4d9e +SHA512 (s390-tools-2.39.0.tar.gz) = ee9447f28f0cc43b4eba8110879174372a4ed85e2e53c3500e02723275c0aee01fd4913558ef3eaa62be40a0f5e634c3eb59587150e809fe14e8b4794e340ac7 +SHA512 (s390-tools-2.39.0-rust-vendor.tar.xz) = eb0cd352e8d3721ba52f79968494e72fc99b5655bbd34c359dfb98d81748a367d87854c799e5d7e88d9fef5209ce0cc5e91286a8259e3fef90e0e53a7b195a20 From 020fb911109c1775c45bf2f59034168197599f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 6 Jan 2026 18:13:01 +0000 Subject: [PATCH 2/4] - rebased to 2.40.0 (rhbz#2421447) --- s390utils.spec | 13 +++++++++++-- sources | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index 026c593..6a85b8c 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -16,7 +16,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.39.0 +Version: 2.40.0 Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later) @@ -74,7 +74,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -Patch100: s390utils-%%{version}-fedora.patch +#Patch100: s390utils-%%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -288,7 +288,9 @@ done %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvimg +%{_bindir}/pvinfo %{_bindir}/pvsecret +%{_bindir}/pvverify %{_mandir}/man1/genprotimg.1* %{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest-check.1* @@ -310,6 +312,7 @@ done %{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* +%{_mandir}/man1/pvverify.1* %dir %{_datadir}/s390-tools %{_datadir}/s390-tools/pvimg/ %{bash_completions_dir}/*.bash @@ -645,9 +648,11 @@ For more information refer to the following publications: %{_bindir}/mk-s390image %{_bindir}/pvapconfig %{_bindir}/pvimg +%{_bindir}/pvinfo %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvsecret +%{_bindir}/pvverify %{_bindir}/zkey %{_bindir}/zkey-cryptsetup %{_bindir}/zpwr @@ -699,6 +704,7 @@ For more information refer to the following publications: %{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* +%{_mandir}/man1/pvverify.1* %{_mandir}/man1/zkey.1* %{_mandir}/man1/zkey-cryptsetup.1* %{_mandir}/man1/zkey-ekmfweb.1* @@ -1129,6 +1135,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Tue Jan 06 2026 Dan Horák - 2:2.40.0-1 +- rebased to 2.40.0 (rhbz#2421447) + * Thu Nov 13 2025 Dan Horák - 2:2.39.0-1 - rebased to 2.39.0 (rhbz#2403755) diff --git a/sources b/sources index 17deb64..8572938 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.39.0.tar.gz) = ee9447f28f0cc43b4eba8110879174372a4ed85e2e53c3500e02723275c0aee01fd4913558ef3eaa62be40a0f5e634c3eb59587150e809fe14e8b4794e340ac7 -SHA512 (s390-tools-2.39.0-rust-vendor.tar.xz) = eb0cd352e8d3721ba52f79968494e72fc99b5655bbd34c359dfb98d81748a367d87854c799e5d7e88d9fef5209ce0cc5e91286a8259e3fef90e0e53a7b195a20 +SHA512 (s390-tools-2.40.0.tar.gz) = 1943429581b280bf9ea370da3700a234d509837cb45b2354cdf79b38db87d2183010d18d9132defd77b9d8e11b7e002c447ffd7c912e20a50da4cb6877758c0e +SHA512 (s390-tools-2.40.0-rust-vendor.tar.xz) = fd1894c4e950a3c51054432731a3aeef4318e794aa4af2dc5fed31da16dce2020f014a64241e44766fb40b0fd6c1ac5943366e38dcfebf264875220ecf1285b5 From 1e19416b2bce1f3042d9ca4f98025fd909007f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 6 Jan 2026 19:31:58 +0100 Subject: [PATCH 3/4] drop outdated patch and add new placeholder one --- s390utils-2.39.0-fedora.patch | 63 ----------------------------------- s390utils-2.40.0-fedora.patch | 0 2 files changed, 63 deletions(-) delete mode 100644 s390utils-2.39.0-fedora.patch create mode 100644 s390utils-2.40.0-fedora.patch diff --git a/s390utils-2.39.0-fedora.patch b/s390utils-2.39.0-fedora.patch deleted file mode 100644 index f6f0d44..0000000 --- a/s390utils-2.39.0-fedora.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 6bf9a8579cc184e64ab54e08073280ad005d50f6 Mon Sep 17 00:00:00 2001 -From: Peter Jin -Date: Wed, 1 Oct 2025 15:02:10 -0400 -Subject: [PATCH 1/2] udev/rules.d: make virtio-blk devices non-rotational -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Performance measurements turned out that in certain situations the -paging/swap logic turns on the rotational feature for block devices. In the -past, this feature has been disabled for DASD devices. FCP and NVMe devices -are considered non-rotational by default (or exposed by the storage server). -Because those are the backing devices on Linux on Z/LinuxONE instances, -ensure that virtio-blk devices are always non-rotational. - -Signed-off-by: Peter Jin -Signed-off-by: Jan Höppner -(cherry picked from commit 82f8c137e1881577d89309223f6d459361c671dd) ---- - etc/udev/rules.d/59-virtio-blk.rules | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 etc/udev/rules.d/59-virtio-blk.rules - -diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules -new file mode 100644 -index 00000000..2e3c13f7 ---- /dev/null -+++ b/etc/udev/rules.d/59-virtio-blk.rules -@@ -0,0 +1 @@ -+SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" --- -2.51.1 - - -From 6e854376073b2907301310b1110f1fc6e02f0dc5 Mon Sep 17 00:00:00 2001 -From: Peter Jin -Date: Wed, 1 Oct 2025 15:09:49 -0400 -Subject: [PATCH 2/2] udev/rules.d: Set default io scheduler to 'none' for - virtio-blk -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use 'none' as default io scheduler for virtio-blk devices. Performance -improvements for multi-queue setups and to reduce CPU consumption. - -Signed-off-by: Peter Jin -Signed-off-by: Jan Höppner -(cherry picked from commit 6ee5ffef91cb4157079fecb89bf42aa41e81e801) ---- - etc/udev/rules.d/59-virtio-blk.rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules -index 2e3c13f7..ca6e1c4d 100644 ---- a/etc/udev/rules.d/59-virtio-blk.rules -+++ b/etc/udev/rules.d/59-virtio-blk.rules -@@ -1 +1,2 @@ - SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" -+SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/scheduler", ATTR{queue/scheduler}="none" --- -2.51.1 - diff --git a/s390utils-2.40.0-fedora.patch b/s390utils-2.40.0-fedora.patch new file mode 100644 index 0000000..e69de29 From 44975e04d93d0818ecac033a2e833404de693091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 6 Jan 2026 19:41:55 +0100 Subject: [PATCH 4/4] update filelist for multi-arch builds --- s390utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 6a85b8c..7da6a02 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -288,7 +288,6 @@ done %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvimg -%{_bindir}/pvinfo %{_bindir}/pvsecret %{_bindir}/pvverify %{_mandir}/man1/genprotimg.1* @@ -314,6 +313,7 @@ done %{_mandir}/man1/pvsecret.1* %{_mandir}/man1/pvverify.1* %dir %{_datadir}/s390-tools +%{_datadir}/s390-tools/netboot/ %{_datadir}/s390-tools/pvimg/ %{bash_completions_dir}/*.bash %{zsh_completions_dir}/_*