diff --git a/s390utils-2.39.0-rhel.patch b/s390utils-2.39.0-rhel.patch deleted file mode 100644 index 8515640..0000000 --- a/s390utils-2.39.0-rhel.patch +++ /dev/null @@ -1,64 +0,0 @@ -From daf4c2f581dee9602e325f80cb5425d352e9dd2d 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 - (RHEL-126745) -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.52.0 - - -From 6ddd22a0972c3e931780b4a4e61f884aedb3a4ff 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 (RHEL-126743) -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.52.0 - diff --git a/s390utils-2.40.0-rhel.patch b/s390utils-2.40.0-rhel.patch new file mode 100644 index 0000000..e69de29 diff --git a/s390utils.spec b/s390utils.spec index 68892dd..a5551c0 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.39.0 +Version: 2.40.0 Release: 1%{?dist} Epoch: 2 License: MIT @@ -47,7 +47,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -Patch100: s390utils-%{version}-rhel.patch +#Patch100: s390utils-%%{version}-rhel.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -121,7 +121,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers. %patch -P 1 -p1 -b .blscfg-rpm-nvr-sort # upstream fixes/updates -%patch -P 100 -p1 +#%%patch -P 100 -p1 # remove --strip from install find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g' @@ -259,6 +259,7 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf %if %{with rust} %{_bindir}/pvimg %{_bindir}/pvsecret +%{_bindir}/pvverify %endif %{_mandir}/man1/genprotimg.1* %{_mandir}/man1/pvattest.1* @@ -282,8 +283,10 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf %{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* +%{_mandir}/man1/pvverify.1* %endif %dir %{_datadir}/s390-tools +%{_datadir}/s390-tools/netboot/ %{_datadir}/s390-tools/pvimg/ %{_datadir}/bash-completion/completions/*.bash %{_datadir}/zsh/site-functions/_* @@ -618,11 +621,13 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm %{_bindir}/pvimg %if %{with rust} %{_bindir}/pvapconfig +%{_bindir}/pvinfo %endif %{_bindir}/pvattest %{_bindir}/pvextract-hdr %if %{with rust} %{_bindir}/pvsecret +%{_bindir}/pvverify %endif %{_bindir}/zkey %{_bindir}/zkey-cryptsetup @@ -677,6 +682,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm %{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* +%{_mandir}/man1/pvverify.1* %endif %{_mandir}/man1/zkey.1* %{_mandir}/man1/zkey-cryptsetup.1* @@ -1101,6 +1107,12 @@ User-space development files for the s390/s390x architecture. %changelog +* Mon Jan 12 2026 Dan Horák - 2:2.40.0-1 +- rebased to 2.40.0 (RHEL-100439) +- zipl/boot: Fix unused loadparm when SCLP line-mode console is absent +- Secure Execution: Add tool to verify host-key documents (RHEL-136796) +- Resolves: RHEL-100439 RHEL-136796 + * Mon Nov 24 2025 Dan Horák - 2:2.39.0-1 - rebased to 2.39.0 (RHEL-100439) - udev/rules.d: Set default io scheduler to 'none' for virtio-blk (RHEL-126743) 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