- rebased to 2.44.0 (RHEL-174898)
- KVM: Quantum Safe SE Header and tooling support (RHEL-149687) - Introduce NVMe SMART data monitoring to the zpcimon service (RHEL-191175) - zkey key support for dm-integrity with HMAC (RHEL-23872) - fix zipl support for mixed type mdadm RAID1 devices (RHEL-180629) - Resolves: RHEL-174898 RHEL-149687 RHEL-191175 RHEL-23872 RHEL-180629
This commit is contained in:
parent
1604c64b60
commit
57abbeae90
30
s390utils-2.44.0-pvics-return.patch
Normal file
30
s390utils-2.44.0-pvics-return.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/scripts/pvics b/scripts/pvics
|
||||
index 18cdbb6b..8fe21a3b 100755
|
||||
--- a/scripts/pvics
|
||||
+++ b/scripts/pvics
|
||||
@@ -1474,12 +1474,6 @@ main() {
|
||||
local -
|
||||
set -Eu
|
||||
|
||||
- # call cleanup on error
|
||||
- # PIPE is needed to allow out=$(main list -i <image> | grep -m 1 <filter>)
|
||||
- # bash will close the subshell executing the main function as soon as grep has found a match
|
||||
- # cleanup will not be executed anymore
|
||||
- trap 'cleanup 1' ERR EXIT PIPE
|
||||
-
|
||||
# general
|
||||
ACTION=""
|
||||
NBD=""
|
||||
@@ -1518,6 +1512,12 @@ main() {
|
||||
# parse command line
|
||||
cli "$@"
|
||||
|
||||
+ # call cleanup on error
|
||||
+ # PIPE is needed to allow out=$(main list -i <image> | grep -m 1 <filter>)
|
||||
+ # bash will close the subshell executing the main function as soon as grep has found a match
|
||||
+ # cleanup will not be executed anymore
|
||||
+ trap 'cleanup 1' ERR EXIT PIPE
|
||||
+
|
||||
# set up logger
|
||||
setup_logger
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
Name: s390utils
|
||||
Summary: Utilities and daemons for IBM z Systems
|
||||
Version: 2.42.1
|
||||
Version: 2.44.0
|
||||
Release: 1%{?dist}
|
||||
Epoch: 2
|
||||
# MIT covers nearly all the files, except init files
|
||||
@ -52,6 +52,10 @@ Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
|
||||
# reverts to keep stability within major RHEL release
|
||||
Patch10: s390utils-tape-revert.patch
|
||||
|
||||
# temporary fixes
|
||||
# https://github.com/ibm-s390-linux/s390-tools/issues/208
|
||||
Patch90: s390utils-2.44.0-pvics-return.patch
|
||||
|
||||
# upstream fixes/updates
|
||||
#Patch100: s390utils-%%{version}-rhel.patch
|
||||
|
||||
@ -430,6 +434,7 @@ BuildRequires: json-c-devel
|
||||
BuildRequires: rpm-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libnl3-devel
|
||||
BuildRequires: libnvme-devel
|
||||
|
||||
|
||||
%description base
|
||||
@ -627,6 +632,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
||||
%{_sbindir}/zmemtopo
|
||||
%{_sbindir}/znetconf
|
||||
%{_sbindir}/zpcictl
|
||||
%{_sbindir}/zpcimon
|
||||
%{_bindir}/cpacfinfo
|
||||
%{_bindir}/dump2tar
|
||||
%{_bindir}/genprotimg
|
||||
@ -644,6 +650,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
||||
%{_bindir}/zpwr
|
||||
%{_unitdir}/dumpconf.service
|
||||
%{_unitdir}/opticsmon.service
|
||||
%{_unitdir}/zpcimon.service
|
||||
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
|
||||
%{_sysconfdir}/mdevctl.d/*
|
||||
@ -746,6 +753,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
||||
%{_mandir}/man8/zmemtopo.8*
|
||||
%{_mandir}/man8/znetconf.8*
|
||||
%{_mandir}/man8/zpcictl.8*
|
||||
%{_mandir}/man8/zpcimon.8*
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/netboot/
|
||||
%{bash_completions_dir}/*.bash
|
||||
@ -1127,6 +1135,14 @@ User-space development files for the s390/s390x architecture.
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 03 2026 Dan Horák <dhorak@redhat.com> - 2:2.44.0-1
|
||||
- rebased to 2.44.0 (RHEL-174898)
|
||||
- KVM: Quantum Safe SE Header and tooling support (RHEL-149687)
|
||||
- Introduce NVMe SMART data monitoring to the zpcimon service (RHEL-191175)
|
||||
- zkey key support for dm-integrity with HMAC (RHEL-23872)
|
||||
- fix zipl support for mixed type mdadm RAID1 devices (RHEL-180629)
|
||||
- Resolves: RHEL-174898 RHEL-149687 RHEL-191175 RHEL-23872 RHEL-180629
|
||||
|
||||
* Tue Jun 02 2026 Dan Horák <dhorak@redhat.com> - 2:2.42.1-1
|
||||
- rebased to 2.42.1 (RHEL-174898)
|
||||
- hyptop: Backward compatibility options causes other issues (RHEL-166157)
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (s390-tools-2.42.1.tar.gz) = 719b000ffc507837f579db8c395cd929151c77e36c598e872cef7cd76b6612f7cd5f8eba87de1df69a446a05ba3a6daa385a4bca2dfdb5b2b52e70cb5a7a197b
|
||||
SHA512 (s390-tools-2.42.1-rust-vendor.tar.xz) = 7fbae9b43d956e2a9b71b6a0a0928fca9506a191424d63f6df109ddc0ce4efa9df2d0e245ee231602a139642fe7fc25f13680eec27a4aa914be151a39876b945
|
||||
SHA512 (s390-tools-2.44.0.tar.gz) = 6f2f7fa45573b1a2515c4ea143ff0877711713724c737f9aaa4f853f6142f215628c10d1827f94cf54a50c1fec757fd3710f3e4b60f6125b0ee952002e43dbf7
|
||||
SHA512 (s390-tools-2.44.0-rust-vendor.tar.xz) = 7c0708a6593d9a2ff307e9e46c63f191532170db43f7f5e4f68c64673dbb7f1dae5663f60236d54b0c67d9bbc3b523aedcdf8747377e63f82f3767586fa3e8c4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user