- rebased to 2.38.0 (RHEL-73342)

- set CFLAGS/LDFLAGS for "make install" to avoid rebuilding some rust crates during installation
- LPAR level power consumption reporting (RHEL-72675)
- Provide Topology-Map information to userspace (RHEL-72682)
- Add CCK secret type for updating the Customer Communication Key (RHEL-73021)
- Convert LUKS2 volume from AES keys to retrievable PAES keys (RHEL-85390)
- Resolves: RHEL-73342 RHEL-72675 RHEL-72682 RHEL-73021 RHEL-85390
This commit is contained in:
Dan Horák 2025-07-07 10:18:06 +02:00
parent 30a2108bed
commit ddf85fc1e0
4 changed files with 28 additions and 9777 deletions

File diff suppressed because it is too large Load Diff

View File

View File

@ -14,8 +14,8 @@
Name: s390utils
Summary: Utilities and daemons for IBM z Systems
Version: 2.36.0
Release: 2%{?dist}
Version: 2.38.0
Release: 1%{?dist}
Epoch: 2
License: MIT
URL: https://github.com/ibm-s390-linux/s390-tools
@ -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'
@ -157,6 +157,7 @@ make \
%install
make install \
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
RUSTFLAGS="%{build_rustflags}" \
%if %{without rust}
HAVE_CARGO=0 \
@ -273,6 +274,7 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
%{_mandir}/man1/pvsecret-create-association.1*
%{_mandir}/man1/pvsecret-create-meta.1*
%{_mandir}/man1/pvsecret-create-retrievable.1*
%{_mandir}/man1/pvsecret-create-update-cck.1*
%{_mandir}/man1/pvsecret-create.1*
%{_mandir}/man1/pvsecret-list.1*
%{_mandir}/man1/pvsecret-lock.1*
@ -282,6 +284,8 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
%endif
%dir %{_datadir}/s390-tools
%{_datadir}/s390-tools/pvimg/
%{_datadir}/bash-completion/completions/*.bash
%{_datadir}/zsh/site-functions/_*
#
# enf of multi-arch section
@ -378,6 +382,8 @@ This package provides minimal set of tools needed to system to boot.
%{_udevrulesdir}/81-ccw.rules
%{_udevrulesdir}/81-dpm.rules
%{_udevrulesdir}/90-cpi.rules
# rule provided by systemd-udev
%exclude %{_udevrulesdir}/80-hotplug-cpu.rules
%{_sysconfdir}/kernel/install.d/20-grubby.install
%{_prefix}/lib/kernel/install.d/10-zfcpdump.install
%{_prefix}/lib/kernel/install.d/20-zipl-kernel.install
@ -485,9 +491,6 @@ s390 base tools. This collection provides the following utilities:
feature. Those traces are filtered with the zfcpdbf script, i.e. merge
several traces, make it more readable etc.
* scsi_logging_level:
Create, get or set the logging level for the SCSI logging facility.
* zconf:
Set of scripts to configure and list status information of Linux for
zSeries IO devices.
@ -587,7 +590,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/qetharp
%{_sbindir}/qethconf
%{_sbindir}/qethqoat
%{_sbindir}/scsi_logging_level
%{_sbindir}/sclpdbf
%{_sbindir}/start_hsnc.sh
%{_sbindir}/tape390_crypt
@ -601,6 +603,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/zfcpdbf
%{_sbindir}/zgetdump
%{_sbindir}/zipl-switch-to-blscfg
%{_sbindir}/zmemtopo
%{_sbindir}/znetconf
%{_sbindir}/zpcictl
%{_bindir}/cpacfinfo
@ -619,12 +622,14 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%endif
%{_bindir}/zkey
%{_bindir}/zkey-cryptsetup
%{_bindir}/zpwr
%{_unitdir}/dumpconf.service
%{_unitdir}/opticsmon.service
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
%{_sysconfdir}/mdevctl.d/*
/usr/lib/dracut/modules.d/99ngdump/
/usr/lib/dracut/dracut.conf.d/99-pkey.conf
# own the mdevctl dirs until new release is available
%dir /usr/lib/mdevctl
%dir /usr/lib/mdevctl/scripts.d
@ -660,6 +665,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man1/pvsecret-create-association.1*
%{_mandir}/man1/pvsecret-create-meta.1*
%{_mandir}/man1/pvsecret-create-retrievable.1*
%{_mandir}/man1/pvsecret-create-update-cck.1*
%{_mandir}/man1/pvsecret-create.1*
%{_mandir}/man1/pvsecret-list.1*
%{_mandir}/man1/pvsecret-lock.1*
@ -671,6 +677,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man1/zkey-cryptsetup.1*
%{_mandir}/man1/zkey-ekmfweb.1*
%{_mandir}/man1/zkey-kmip.1*
%{_mandir}/man1/zpwr.1*
%{_mandir}/man4/prandom.4*
%{_mandir}/man5/hsavmcore.conf.5*
%{_mandir}/man8/chccwdev.8*
@ -716,10 +723,13 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man8/zfcpdbf.8*
%{_mandir}/man8/zgetdump.8*
%{_mandir}/man8/zipl-switch-to-blscfg.8*
%{_mandir}/man8/zmemtopo.8*
%{_mandir}/man8/znetconf.8*
%{_mandir}/man8/zpcictl.8*
%dir %{_datadir}/s390-tools
%{_datadir}/s390-tools/netboot/
%{_datadir}/bash-completion/completions/*.bash
%{_datadir}/zsh/site-functions/_*
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip/profiles
@ -1085,6 +1095,14 @@ User-space development files for the s390/s390x architecture.
%changelog
* Mon Jul 14 2025 Dan Horák <dhorak@redhat.com> - 2:2.38.0-1
- rebased to 2.38.0 (RHEL-73342)
- LPAR level power consumption reporting (RHEL-72675)
- Provide Topology-Map information to userspace (RHEL-72682)
- Add CCK secret type for updating the Customer Communication Key (RHEL-73021)
- Convert LUKS2 volume from AES keys to retrievable PAES keys (RHEL-85390)
- Resolves: RHEL-73342 RHEL-72675 RHEL-72682 RHEL-73021 RHEL-85390
* Thu Jan 30 2025 Dan Horák <dhorak@redhat.com> - 2:2.36.0-2
- pvimg/genprotimg: Fix confidential dump support (RHEL-76912)
- Resolves: RHEL-76912

View File

@ -1,2 +1,2 @@
SHA512 (s390-tools-2.36.0.tar.gz) = 5704dcbfc88972ff74b5d81acf549e719b90f2ce60b66ca6935c16c0b266ca6728adca72133aa51e1a5acfbabfd6f121b7f9b5023be498c5a203217adc4f5c46
SHA512 (s390-tools-2.36.0-rust-vendor.tar.xz) = 2e4f53b64e71307e79a3a433c7bd2a6304b0c4e6e34cb84c57e459e86ec25c14b64eab870f0081f2f31d5b8003b071e8f45cf639111a1e759f0dfa070a96d765
SHA512 (s390-tools-2.38.0.tar.gz) = 9ca9393e9deeab5c1df5e9eaa3c12e340917ffd5fe07d9a09087d6488d8e2ec0a136805650830d128595854b818a1da94151003e15954e556ba373b226a7369e
SHA512 (s390-tools-2.38.0-rust-vendor.tar.xz) = c55d2870ad9f90333de2536e7921951185746f0972d5d488bf317b56e754525e4dbd0f63d547229197199b51d41b7032172b6ba7ffacd9a96a01dbd13b9c4d9e