import CS s390utils-2.29.0-3.el9
This commit is contained in:
parent
541e8e05c0
commit
d8b7dc8033
|
|
@ -1 +1,2 @@
|
|||
SOURCES/s390-tools-2.27.0.tar.gz
|
||||
SOURCES/s390-tools-2.29.0-rust-vendor.tar.xz
|
||||
SOURCES/s390-tools-2.29.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
ebfc228d39c55586d6b5af08682896adda6b0068 SOURCES/s390-tools-2.27.0.tar.gz
|
||||
1dcae3e55c2d4d945d0b5c61a12671468aa5f7ef SOURCES/s390-tools-2.29.0-rust-vendor.tar.xz
|
||||
e10ffbde7f3fcf4438fdfdd83051ad68518e7be5 SOURCES/s390-tools-2.29.0.tar.gz
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,21 +1,30 @@
|
|||
# secure boot support is for RHEL only
|
||||
%if 0%{?rhel} >= 8
|
||||
%global signzipl 1
|
||||
%bcond_without signzipl
|
||||
%else
|
||||
%bcond_with signzipl
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_pandoc 1
|
||||
%bcond_without pandoc
|
||||
%else
|
||||
%bcond_with pandoc
|
||||
%endif
|
||||
%bcond_without rust
|
||||
|
||||
Name: s390utils
|
||||
Summary: Utilities and daemons for IBM z Systems
|
||||
Version: 2.27.0
|
||||
Release: 4%{?dist}
|
||||
Version: 2.29.0
|
||||
Release: 3%{?dist}
|
||||
Epoch: 2
|
||||
License: MIT
|
||||
ExclusiveArch: s390 s390x
|
||||
URL: https://github.com/ibm-s390-linux/s390-tools
|
||||
Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
||||
# To create the vendor tarball:
|
||||
# tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust/pvsecret ; \
|
||||
# rm -f Cargo.lock && cargo vendor && \
|
||||
# tar Jvcf ../../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
|
||||
Source1: s390-tools-%{version}-rust-vendor.tar.xz
|
||||
Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh
|
||||
Source7: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev
|
||||
Source12: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev
|
||||
|
|
@ -29,7 +38,7 @@ Source23: 20-zipl-kernel.install
|
|||
Source24: 52-zipl-rescue.install
|
||||
Source25: 91-zipl.install
|
||||
|
||||
%if 0%{?signzipl}
|
||||
%if %{with signzipl}
|
||||
%define pesign_name redhatsecureboot302
|
||||
%endif
|
||||
|
||||
|
|
@ -40,6 +49,13 @@ Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
|
|||
# upstream fixes/updates
|
||||
Patch100: s390utils-%{version}-rhel.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native package structure
|
||||
#
|
||||
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-base = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-osasnmpd = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -47,9 +63,47 @@ Requires: s390utils-cpuplugd = %{epoch}:%{version}-%{release}
|
|||
Requires: s390utils-mon_statd = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-iucvterm = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-ziomon = %{epoch}:%{version}-%{release}
|
||||
%else
|
||||
#
|
||||
# multiarch package structure
|
||||
#
|
||||
Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
|
||||
%endif
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glib2-devel
|
||||
%if %{with rust}
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: rust-toolset
|
||||
%else
|
||||
BuildRequires: crate(anstream)
|
||||
BuildRequires: crate(anstyle-query)
|
||||
BuildRequires: crate(anyhow)
|
||||
BuildRequires: crate(byteorder)
|
||||
BuildRequires: crate(cfg-if)
|
||||
BuildRequires: crate(clap)
|
||||
BuildRequires: crate(clap_complete)
|
||||
BuildRequires: crate(clap_derive)
|
||||
BuildRequires: crate(colorchoice)
|
||||
BuildRequires: crate(curl)
|
||||
BuildRequires: crate(is-terminal)
|
||||
BuildRequires: crate(libc)
|
||||
BuildRequires: crate(log)
|
||||
BuildRequires: crate(openssl)
|
||||
BuildRequires: crate(openssl-probe)
|
||||
BuildRequires: crate(serde)
|
||||
BuildRequires: crate(serde_derive)
|
||||
BuildRequires: crate(serde_yaml)
|
||||
BuildRequires: crate(strsim)
|
||||
BuildRequires: crate(terminal_size)
|
||||
BuildRequires: crate(thiserror)
|
||||
BuildRequires: crate(zerocopy)
|
||||
BuildRequires: rust-packaging
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
This is a meta package for installing the default s390-tools sub packages.
|
||||
|
|
@ -72,12 +126,26 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
|
|||
# remove --strip from install
|
||||
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
|
||||
|
||||
%if %{with rust}
|
||||
%if 0%{?rhel}
|
||||
pushd rust
|
||||
%cargo_prep -V 1
|
||||
popd
|
||||
%else
|
||||
%cargo_prep
|
||||
%endif
|
||||
rm -rf ./rust/Cargo.lock
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
make \
|
||||
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
||||
%if %{without rust}
|
||||
HAVE_CARGO=0 \
|
||||
%endif
|
||||
HAVE_DRACUT=1 \
|
||||
%if 0%{?with_pandoc}
|
||||
%if %{with pandoc}
|
||||
ENABLE_DOC=1 \
|
||||
%endif
|
||||
NO_PIE_LDFLAGS="" \
|
||||
|
|
@ -88,8 +156,11 @@ make \
|
|||
|
||||
%install
|
||||
make install \
|
||||
%if %{without rust}
|
||||
HAVE_CARGO=0 \
|
||||
%endif
|
||||
HAVE_DRACUT=1 \
|
||||
%if 0%{?with_pandoc}
|
||||
%if %{with pandoc}
|
||||
ENABLE_DOC=1 \
|
||||
%endif
|
||||
DESTDIR=%{buildroot} \
|
||||
|
|
@ -98,8 +169,12 @@ make install \
|
|||
DISTRELEASE=%{release} \
|
||||
V=1
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native specific %%install section
|
||||
#
|
||||
# sign the stage3 bootloader
|
||||
%if 0%{?signzipl}
|
||||
%if %{with signzipl}
|
||||
if [ -x /usr/bin/rpm-sign ]; then
|
||||
pushd %{buildroot}/lib/s390-tools/
|
||||
rpm-sign --key "%{pesign_name}" --lkmsign stage3.bin --output stage3.signed
|
||||
|
|
@ -157,11 +232,62 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
|
|||
|
||||
# zipl.conf to be ghosted
|
||||
touch %{buildroot}%{_sysconfdir}/zipl.conf
|
||||
%endif
|
||||
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native main %%files section
|
||||
#
|
||||
%files
|
||||
%doc README.md
|
||||
|
||||
%else
|
||||
#
|
||||
# multiarch %%files section
|
||||
#
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_bindir}/genprotimg
|
||||
%if %{with rust}
|
||||
%{_bindir}/pvapconfig
|
||||
%endif
|
||||
%{_bindir}/pvattest
|
||||
%{_bindir}/pvextract-hdr
|
||||
%if %{with rust}
|
||||
%{_bindir}/pvsecret
|
||||
%endif
|
||||
%{_mandir}/man1/genprotimg.1*
|
||||
%if %{with rust}
|
||||
%{_mandir}/man1/pvapconfig.1*
|
||||
%endif
|
||||
%{_mandir}/man1/pvattest.1*
|
||||
%{_mandir}/man1/pvattest-create.1*
|
||||
%{_mandir}/man1/pvattest-perform.1*
|
||||
%{_mandir}/man1/pvattest-verify.1*
|
||||
%if %{with rust}
|
||||
%{_mandir}/man1/pvsecret-add.1*
|
||||
%{_mandir}/man1/pvsecret-create-association.1*
|
||||
%{_mandir}/man1/pvsecret-create-meta.1*
|
||||
%{_mandir}/man1/pvsecret-create.1*
|
||||
%{_mandir}/man1/pvsecret-list.1*
|
||||
%{_mandir}/man1/pvsecret-lock.1*
|
||||
%{_mandir}/man1/pvsecret-version.1*
|
||||
%{_mandir}/man1/pvsecret.1*
|
||||
%endif
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/genprotimg/
|
||||
|
||||
#
|
||||
# enf of multi-arch section
|
||||
#
|
||||
%endif
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x specific sub-packages
|
||||
#
|
||||
#
|
||||
# ************************* s390-tools core package *************************
|
||||
#
|
||||
|
|
@ -265,6 +391,7 @@ Requires: ethtool
|
|||
Requires: tar
|
||||
Requires: file
|
||||
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
|
||||
%{?systemd_requires}
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: ncurses-devel
|
||||
|
|
@ -272,7 +399,6 @@ BuildRequires: glibc-static
|
|||
BuildRequires: cryptsetup-devel >= 2.0.3
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: rpm-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libxml2-devel
|
||||
|
||||
|
||||
|
|
@ -469,8 +595,14 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_bindir}/dump2tar
|
||||
%{_bindir}/genprotimg
|
||||
%{_bindir}/mk-s390image
|
||||
%if %{with rust}
|
||||
%{_bindir}/pvapconfig
|
||||
%endif
|
||||
%{_bindir}/pvattest
|
||||
%{_bindir}/pvextract-hdr
|
||||
%if %{with rust}
|
||||
%{_bindir}/pvsecret
|
||||
%endif
|
||||
%{_bindir}/zkey
|
||||
%{_bindir}/zkey-cryptsetup
|
||||
%{_unitdir}/dumpconf.service
|
||||
|
|
@ -495,10 +627,23 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_libdir}/zkey/zkey-kmip.so
|
||||
%{_mandir}/man1/dump2tar.1*
|
||||
%{_mandir}/man1/genprotimg.1*
|
||||
%if %{with rust}
|
||||
%{_mandir}/man1/pvapconfig.1*
|
||||
%endif
|
||||
%{_mandir}/man1/pvattest.1*
|
||||
%{_mandir}/man1/pvattest-create.1*
|
||||
%{_mandir}/man1/pvattest-perform.1*
|
||||
%{_mandir}/man1/pvattest-verify.1*
|
||||
%if %{with rust}
|
||||
%{_mandir}/man1/pvsecret-add.1*
|
||||
%{_mandir}/man1/pvsecret-create-association.1*
|
||||
%{_mandir}/man1/pvsecret-create-meta.1*
|
||||
%{_mandir}/man1/pvsecret-create.1*
|
||||
%{_mandir}/man1/pvsecret-list.1*
|
||||
%{_mandir}/man1/pvsecret-lock.1*
|
||||
%{_mandir}/man1/pvsecret-version.1*
|
||||
%{_mandir}/man1/pvsecret.1*
|
||||
%endif
|
||||
%{_mandir}/man1/zkey.1*
|
||||
%{_mandir}/man1/zkey-cryptsetup.1*
|
||||
%{_mandir}/man1/zkey-ekmfweb.1*
|
||||
|
|
@ -548,7 +693,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_mandir}/man8/znetconf.8*
|
||||
%{_mandir}/man8/zpcictl.8*
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/genprotimg/
|
||||
%{_datadir}/s390-tools/netboot/
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
|
||||
|
|
@ -560,6 +704,18 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
# Additional Fedora/RHEL specific stuff
|
||||
/boot/tape0
|
||||
|
||||
%package se-data
|
||||
License: MIT
|
||||
Summary: Data for Secure Execution
|
||||
BuildArch: noarch
|
||||
|
||||
%description se-data
|
||||
%{summary}.
|
||||
|
||||
%files se-data
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/genprotimg/
|
||||
|
||||
#
|
||||
# *********************** s390-tools osasnmpd package ***********************
|
||||
#
|
||||
|
|
@ -843,7 +999,7 @@ Summary: Use multipath information for re-IPL path failover
|
|||
BuildRequires: make
|
||||
BuildRequires: bash
|
||||
BuildRequires: coreutils
|
||||
%if 0%{?with_pandoc}
|
||||
%if %{with pandoc}
|
||||
BuildRequires: pandoc
|
||||
%endif
|
||||
BuildRequires: gawk
|
||||
|
|
@ -864,7 +1020,7 @@ reconfigures the FCP re-IPL settings to use an operational path.
|
|||
|
||||
%files chreipl-fcp-mpath
|
||||
%doc chreipl-fcp-mpath/README.md
|
||||
%if 0%{?with_pandoc}
|
||||
%if %{with pandoc}
|
||||
%doc chreipl-fcp-mpath/README.html
|
||||
%endif
|
||||
%dir %{_prefix}/lib/chreipl-fcp-mpath/
|
||||
|
|
@ -896,8 +1052,31 @@ User-space development files for the s390/s390x architecture.
|
|||
%{_libdir}/libekmfweb.so
|
||||
%{_libdir}/libkmipclient.so
|
||||
|
||||
#
|
||||
# end of s390x specific sub-packages
|
||||
#
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* Fri Jan 19 2024 Dan Horák <dhorak@redhat.com> - 2:2.29.0-2
|
||||
- SE: Secure guest tool to bind and associate APQNs (RHEL-10574)
|
||||
- Resolves: RHEL-10574
|
||||
|
||||
* Fri Nov 24 2023 Dan Horák <dhorak@redhat.com> - 2:2.29.0-1
|
||||
- rebased to 2.29.0 (RHEL-11408)
|
||||
- KVM: Support AP Bindings in SE Header (RHEL-10572)
|
||||
- KVM: Userspace Tool for IBK Request Generation and Insertion (RHEL-10578)
|
||||
- zkey: support for key type PKEY_TYPE_EP11_AES (RHEL-11440)
|
||||
- vmur: fix handling of option -t (RHEL-11480)
|
||||
- dbginfo.sh: global original Input Field Separator (IFS) (RHEL-16527)
|
||||
- enable multi-arch build (RHEL-10567)
|
||||
- Resolves: RHEL-11408 RHEL-10572 RHEL-10578 RHEL-11440 RHEL-11480 RHEL-16527 RHEL-10567
|
||||
|
||||
* Mon Aug 7 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-4
|
||||
- zdev/dracut: fix kdump build to integrate with site support (#2229177)
|
||||
- Resolves: #2229177
|
||||
|
|
|
|||
Loading…
Reference in New Issue