- rebased to 2.33.1 (RHEL-23704)

- dbginfo.sh: missing data of new ROCE cards (RHEL-24109)
- SE-tooling: New IBM host-key subject locality (RHEL-30273)
- Fix disk type detection when running under QEMU (RHEL-40358)
- Resolves: RHEL-23704 RHEL-24109 RHEL-30273 RHEL-40358
This commit is contained in:
Dan Horák 2024-06-14 10:14:03 +00:00 committed by Dan Horák
parent 2b78cdadff
commit 1dd6d2cbd8
5 changed files with 26 additions and 5731 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/s390-tools-*.tar.gz
/s390-tools-2.29.0-rust-vendor.tar.xz
/s390-tools-*-rust-vendor.tar.xz

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.29.0
Release: 3%{?dist}
Version: 2.33.1
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}
@ -117,11 +117,11 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
%setup -q -n s390-tools-%{version}
# Fedora/RHEL changes
%patch0 -p1 -b .zipl-invert-script-options
%patch1 -p1 -b .blscfg-rpm-nvr-sort
%patch -P 0 -p1 -b .zipl-invert-script-options
%patch -P 1 -p1 -b .blscfg-rpm-nvr-sort
# upstream fixes/updates
%patch100 -p1
#%%patch -P 100 -p1
# remove --strip from install
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
@ -273,7 +273,7 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
%{_mandir}/man1/pvsecret-create.1*
%{_mandir}/man1/pvsecret-list.1*
%{_mandir}/man1/pvsecret-lock.1*
%{_mandir}/man1/pvsecret-version.1*
%{_mandir}/man1/pvsecret-verify.1*
%{_mandir}/man1/pvsecret.1*
%endif
%dir %{_datadir}/s390-tools
@ -331,7 +331,10 @@ This package provides minimal set of tools needed to system to boot.
/lib/s390-tools/cpictl
/lib/s390-tools/stage3.bin
/lib/s390-tools/zdev_id
/lib/s390-tools/zdev-from-dasd_mod.dasd
/lib/s390-tools/zdev-root-update
/lib/s390-tools/zdev-to-dasd_mod.dasd
/lib/s390-tools/zdev-to-rd.znet
/lib/s390-tools/zipl.conf
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
%config(noreplace) %{_sysconfdir}/ziplenv
@ -549,6 +552,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/chccwdev
%{_sbindir}/chchp
%{_sbindir}/chcpumf
%{_sbindir}/chpstat
%{_sbindir}/chshut
%{_sbindir}/chzcrypt
%{_sbindir}/dasdstat
@ -563,8 +567,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_sbindir}/lscss
%{_sbindir}/lsdasd
%{_sbindir}/lshwc
%{_sbindir}/lsqeth
%{_sbindir}/lsluns
%{_sbindir}/lsqeth
%{_sbindir}/lspai
%{_sbindir}/lsreipl
%{_sbindir}/lsscm
%{_sbindir}/lsshut
@ -641,7 +646,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man1/pvsecret-create.1*
%{_mandir}/man1/pvsecret-list.1*
%{_mandir}/man1/pvsecret-lock.1*
%{_mandir}/man1/pvsecret-version.1*
%{_mandir}/man1/pvsecret-verify.1*
%{_mandir}/man1/pvsecret.1*
%endif
%{_mandir}/man1/zkey.1*
@ -653,6 +658,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man8/chccwdev.8*
%{_mandir}/man8/chchp.8*
%{_mandir}/man8/chcpumf.8*
%{_mandir}/man8/chpstat.8*
%{_mandir}/man8/chshut.8*
%{_mandir}/man8/chzcrypt.8*
%{_mandir}/man8/dasdstat.8*
@ -668,6 +674,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
%{_mandir}/man8/lsdasd.8*
%{_mandir}/man8/lshwc.8*
%{_mandir}/man8/lsluns.8*
%{_mandir}/man8/lspai.8*
%{_mandir}/man8/lsqeth.8*
%{_mandir}/man8/lsreipl.8*
%{_mandir}/man8/lsscm.8*
@ -1059,6 +1066,13 @@ User-space development files for the s390/s390x architecture.
%changelog
* Fri Jun 14 2024 Dan Horák <dhorak@redhat.com> - 2:2.33.1-1
- rebased to 2.33.1 (RHEL-23704)
- dbginfo.sh: missing data of new ROCE cards (RHEL-24109)
- SE-tooling: New IBM host-key subject locality (RHEL-30273)
- Fix disk type detection when running under QEMU (RHEL-40358)
- Resolves: RHEL-23704 RHEL-24109 RHEL-30273 RHEL-40358
* Mon Jan 29 2024 Dan Horák <dhorak@redhat.com> - 2:2.29.0-3
- add s390utils-se-data as a noarch subpackage with Secure Execution data files
- Resolves: RHEL-10567

View File

@ -1,2 +1,2 @@
SHA512 (s390-tools-2.29.0.tar.gz) = 3eeaab0e0c6559b9fb0b4c7cca49358a7cc7fe0cb11684d2d761fe105cc2bfd791d33ecc2070e3dfd877039b68e868699cd3cea318e64aee1cc0f348c7b41617
SHA512 (s390-tools-2.29.0-rust-vendor.tar.xz) = 2d3a6215c78e044d8d311d64e49866f8ef978738b3c875f43a6bd6ea5f587924f54deeccbc1d1157786073cfef487027f07750b74d5141e39984a2876499453e
SHA512 (s390-tools-2.33.1.tar.gz) = 8e5cba1e5264787a2f89b340d4d9372df7cd28ae9fa263dcbc6cbbf460e48c1db167110ff901f35f82e36d0d8c97105acd7167b40d889a829c71b182e175b96c
SHA512 (s390-tools-2.33.1-rust-vendor.tar.xz) = 12b0d3af1eba223b63028b5fec85ff4cc79ec646671e56d4c3606b0b4a9d3f79469dc860141ff86e9a0fd2bc1d54f32f2588615997a9865adbe20a110237b98d