Compare commits
No commits in common. "rawhide" and "f39" have entirely different histories.
5 changed files with 91 additions and 331 deletions
|
|
@ -4,6 +4,5 @@ pathmigration:
|
|||
- /lib/s390-tools
|
||||
|
||||
badfuncs:
|
||||
allowed:
|
||||
/usr/bin/qethqoat:
|
||||
- inet_ntoa
|
||||
ignore:
|
||||
- /usr/sbin/qethqoat
|
||||
|
|
|
|||
401
s390utils.spec
401
s390utils.spec
|
|
@ -11,47 +11,23 @@
|
|||
%bcond_with pandoc
|
||||
%endif
|
||||
|
||||
# Also controls whether %%cargo_generate_buildrequires generates dev-dependencies
|
||||
%bcond_without check
|
||||
%bcond_without rust
|
||||
|
||||
Name: s390utils
|
||||
Summary: Utilities and daemons for IBM z Systems
|
||||
Version: 2.40.0
|
||||
Release: 1%{?dist}
|
||||
Version: 2.29.0
|
||||
Release: 4%{?dist}
|
||||
Epoch: 2
|
||||
# MIT covers nearly all the files, except init files (LGPL-2.1-or-later)
|
||||
#
|
||||
# Statically-linked Rust dependencies contribute additional license terms,
|
||||
# listed in the output of %%{cargo_license_summary}:
|
||||
#
|
||||
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
|
||||
# Apache-2.0
|
||||
# Apache-2.0 OR BSL-1.0
|
||||
# Apache-2.0 OR MIT
|
||||
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
|
||||
# BSD-2-Clause OR Apache-2.0 OR MIT
|
||||
# MIT
|
||||
# MIT OR Apache-2.0
|
||||
# Unlicense OR MIT
|
||||
%global extra_licenses_from_rust_deps %{shrink:
|
||||
Apache-2.0 AND
|
||||
(Apache-2.0 OR BSL-1.0) AND
|
||||
(Apache-2.0 OR MIT) AND
|
||||
(Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND
|
||||
(BSD-2-Clause OR Apache-2.0 OR MIT) AND
|
||||
Unicode-DFS-2016 AND
|
||||
(Unlicense OR MIT)
|
||||
}
|
||||
License: MIT AND LGPL-2.1-or-later AND %{extra_licenses_from_rust_deps}
|
||||
# MIT covers nearly all the files, except init files
|
||||
License: MIT AND LGPL-2.1-or-later
|
||||
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 ; \
|
||||
# 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
|
||||
%if 0%{?rhel}
|
||||
# tar Jvcf ../../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
|
||||
Source1: s390-tools-%{version}-rust-vendor.tar.xz
|
||||
%endif
|
||||
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
|
||||
|
|
@ -72,20 +48,12 @@ Source25: 91-zipl.install
|
|||
# change the defaults to match Fedora environment
|
||||
Patch0: s390-tools-zipl-invert-script-options.patch
|
||||
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
|
||||
# https://github.com/ibm-s390-linux/s390-tools/pull/155
|
||||
Patch2: snmp-semicolon.patch
|
||||
|
||||
# upstream fixes/updates
|
||||
#Patch100: s390utils-%%{version}-fedora.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
# Add Provides for upstream name
|
||||
Provides: s390-tools = %{epoch}:%{version}-%{release}
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native package structure
|
||||
#
|
||||
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-base = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-osasnmpd = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -93,22 +61,39 @@ 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: cargo-rpm-macros >= 24
|
||||
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) = 0.6.5
|
||||
BuildRequires: rust-packaging
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
|
@ -122,77 +107,48 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
|
|||
%prep
|
||||
%autosetup -n s390-tools-%{version} -p1
|
||||
|
||||
%if %{with rust}
|
||||
%if 0%{?rhel}
|
||||
pushd rust
|
||||
tar xf %{SOURCE1}
|
||||
%cargo_prep -v vendor
|
||||
%cargo_prep -V 1
|
||||
popd
|
||||
%else
|
||||
%cargo_prep
|
||||
%endif
|
||||
rm ./rust/Cargo.lock
|
||||
|
||||
# Create sysusers config files
|
||||
echo 'g zkeyadm' > s390utils-base.conf.usr
|
||||
echo 'g ts-shell' > s390utils-iucvterm.conf.usr
|
||||
echo 'g cpacfstats' > s390utils-cpacfstatsd.conf.usr
|
||||
|
||||
# Create tmpfiles config files
|
||||
echo 'd /var/log/ts-shell 2770 root ts-shell' > s390utils-iucvterm.conf.tmp
|
||||
|
||||
%if !0%{?rhel}
|
||||
%generate_buildrequires
|
||||
pushd rust >/dev/null
|
||||
%cargo_generate_buildrequires
|
||||
popd >/dev/null
|
||||
rm -rf ./rust/pvsecret/Cargo.lock
|
||||
%endif
|
||||
|
||||
%build
|
||||
make \
|
||||
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
||||
HAVE_DRACUT=1 \
|
||||
%if %{without rust}
|
||||
HAVE_CARGO=0 \
|
||||
%endif
|
||||
%if %{with pandoc}
|
||||
ENABLE_DOC=1 \
|
||||
%endif
|
||||
NO_PIE_LDFLAGS="" \
|
||||
%if "%{_sbindir}" == "%{_bindir}"
|
||||
BINDIR=/usr/bin \
|
||||
USRSBINDIR=/usr/bin \
|
||||
%else
|
||||
BINDIR=/usr/sbin \
|
||||
%endif
|
||||
DISTRELEASE=%{release} \
|
||||
V=1
|
||||
|
||||
pushd rust
|
||||
%cargo_license_summary
|
||||
%{cargo_license} > LICENSE.dependencies
|
||||
%if 0%{?rhel}
|
||||
%cargo_vendor_manifest
|
||||
%endif
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
%make_install \
|
||||
make install \
|
||||
HAVE_DRACUT=1 \
|
||||
%if %{without rust}
|
||||
HAVE_CARGO=0 \
|
||||
%endif
|
||||
%if %{with pandoc}
|
||||
ENABLE_DOC=1 \
|
||||
%endif
|
||||
%if "%{_sbindir}" == "%{_bindir}"
|
||||
BINDIR=/usr/bin \
|
||||
USRSBINDIR=/usr/bin \
|
||||
%else
|
||||
DESTDIR=%{buildroot} \
|
||||
BINDIR=/usr/sbin \
|
||||
%endif
|
||||
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
||||
DISTRELEASE=%{release} \
|
||||
V=1
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native specific %%install section
|
||||
#
|
||||
# sign the stage3 bootloader
|
||||
%if %{with signzipl}
|
||||
if [ -x /usr/bin/rpm-sign ]; then
|
||||
|
|
@ -207,7 +163,6 @@ fi
|
|||
|
||||
# move tools to searchable dir
|
||||
mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image %{buildroot}%{_bindir}
|
||||
mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image.1 %{buildroot}%{_mandir}/man1
|
||||
|
||||
mkdir -p %{buildroot}{/boot,%{_udevrulesdir},%{_sysconfdir}/{profile.d,sysconfig},%{_prefix}/lib/modules-load.d}
|
||||
install -p -m 644 zipl/boot/tape0.bin %{buildroot}/boot/tape0
|
||||
|
|
@ -254,88 +209,17 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
|
|||
# zipl.conf to be ghosted
|
||||
touch %{buildroot}%{_sysconfdir}/zipl.conf
|
||||
|
||||
# install systemd sysusers and tmpfiles
|
||||
mkdir -p %{buildroot}{%{_sysusersdir},%{_tmpfilesdir}}/
|
||||
for f in s390utils-*.conf.usr; do
|
||||
install -p -m 644 $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f)
|
||||
done
|
||||
for f in s390utils-*.conf.tmp; do
|
||||
install -p -m 644 $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f)
|
||||
done
|
||||
|
||||
%endif
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native main %%files section
|
||||
#
|
||||
%files
|
||||
%doc README.md
|
||||
|
||||
%else
|
||||
#
|
||||
# multiarch %%files section
|
||||
#
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%license rust/LICENSE.dependencies
|
||||
%if 0%{?rhel}
|
||||
%license rust/cargo-vendor.txt
|
||||
%endif
|
||||
%{_bindir}/genprotimg
|
||||
%{_bindir}/pvattest
|
||||
%{_bindir}/pvextract-hdr
|
||||
%{_bindir}/pvimg
|
||||
%{_bindir}/pvsecret
|
||||
%{_bindir}/pvverify
|
||||
%{_mandir}/man1/genprotimg.1*
|
||||
%{_mandir}/man1/pvattest.1*
|
||||
%{_mandir}/man1/pvattest-check.1*
|
||||
%{_mandir}/man1/pvattest-create.1*
|
||||
%{_mandir}/man1/pvattest-perform.1*
|
||||
%{_mandir}/man1/pvattest-verify.1*
|
||||
%{_mandir}/man1/pvimg.1*
|
||||
%{_mandir}/man1/pvimg-create.1*
|
||||
%{_mandir}/man1/pvimg-info.1*
|
||||
%{_mandir}/man1/pvimg-test.1*
|
||||
%{_mandir}/man1/pvsecret-add.1*
|
||||
%{_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*
|
||||
%{_mandir}/man1/pvsecret-retrieve.1*
|
||||
%{_mandir}/man1/pvsecret-verify.1*
|
||||
%{_mandir}/man1/pvsecret.1*
|
||||
%{_mandir}/man1/pvverify.1*
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/netboot/
|
||||
%{_datadir}/s390-tools/pvimg/
|
||||
%{bash_completions_dir}/*.bash
|
||||
%{zsh_completions_dir}/_*
|
||||
|
||||
#
|
||||
# enf of multi-arch section
|
||||
#
|
||||
%endif
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x specific sub-packages
|
||||
#
|
||||
#
|
||||
# ************************* s390-tools core package *************************
|
||||
#
|
||||
%package core
|
||||
License: MIT
|
||||
Summary: S390 core tools
|
||||
Provides: s390-tools-core = %{epoch}:%{version}-%{release}
|
||||
Requires: coreutils
|
||||
Requires: makedumpfile
|
||||
%{?systemd_requires}
|
||||
# BRs are covered via the base package
|
||||
|
||||
|
|
@ -372,10 +256,7 @@ 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
|
||||
|
|
@ -411,12 +292,10 @@ This package provides minimal set of tools needed to system to boot.
|
|||
%{_udevrulesdir}/56-dasd.rules
|
||||
%{_udevrulesdir}/56-zfcp.rules
|
||||
%{_udevrulesdir}/59-dasd.rules
|
||||
%{_udevrulesdir}/59-virtio-blk.rules
|
||||
%{_udevrulesdir}/60-readahead.rules
|
||||
%{_udevrulesdir}/81-ccw.rules
|
||||
%{_udevrulesdir}/81-dpm.rules
|
||||
%{_udevrulesdir}/90-cpi.rules
|
||||
%{_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
|
||||
|
|
@ -429,18 +308,14 @@ This package provides minimal set of tools needed to system to boot.
|
|||
#
|
||||
|
||||
%package base
|
||||
License: MIT AND LGPL-2.1-or-later AND %{extra_licenses_from_rust_deps}
|
||||
License: MIT AND LGPL-2.1-or-later
|
||||
Summary: S390 base tools
|
||||
Provides: s390-tools-base = %{epoch}:%{version}-%{release}
|
||||
Requires: coreutils
|
||||
Requires: ethtool
|
||||
Requires: file
|
||||
Requires: gawk
|
||||
Requires: sed
|
||||
Requires: gawk sed coreutils
|
||||
Requires: sg3_utils
|
||||
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
|
||||
|
|
@ -448,8 +323,8 @@ BuildRequires: glibc-static
|
|||
BuildRequires: cryptsetup-devel >= 2.0.3
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: rpm-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libnl3-devel
|
||||
|
||||
|
||||
%description base
|
||||
|
|
@ -527,6 +402,9 @@ 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.
|
||||
|
|
@ -578,6 +456,10 @@ For more information refer to the following publications:
|
|||
* "Device Drivers, Features, and Commands" chapter "Useful Linux commands"
|
||||
* "Using the dump tools"
|
||||
|
||||
%pre base
|
||||
# check for zkeyadm group and create it
|
||||
getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
||||
|
||||
%post base
|
||||
%systemd_post dumpconf.service
|
||||
|
||||
|
|
@ -589,14 +471,9 @@ For more information refer to the following publications:
|
|||
|
||||
%files base
|
||||
%doc README.md zdev/src/lszdev_usage.txt
|
||||
%license rust/LICENSE.dependencies
|
||||
%if 0%{?rhel}
|
||||
%license rust/cargo-vendor.txt
|
||||
%endif
|
||||
%{_sbindir}/chccwdev
|
||||
%{_sbindir}/chchp
|
||||
%{_sbindir}/chcpumf
|
||||
%{_sbindir}/chpstat
|
||||
%{_sbindir}/chshut
|
||||
%{_sbindir}/chzcrypt
|
||||
%{_sbindir}/dasdstat
|
||||
|
|
@ -611,9 +488,8 @@ For more information refer to the following publications:
|
|||
%{_sbindir}/lscss
|
||||
%{_sbindir}/lsdasd
|
||||
%{_sbindir}/lshwc
|
||||
%{_sbindir}/lsluns
|
||||
%{_sbindir}/lsqeth
|
||||
%{_sbindir}/lspai
|
||||
%{_sbindir}/lsluns
|
||||
%{_sbindir}/lsreipl
|
||||
%{_sbindir}/lsscm
|
||||
%{_sbindir}/lsshut
|
||||
|
|
@ -621,11 +497,11 @@ For more information refer to the following publications:
|
|||
%{_sbindir}/lstape
|
||||
%{_sbindir}/lszcrypt
|
||||
%{_sbindir}/lszfcp
|
||||
%{_sbindir}/opticsmon
|
||||
%{_sbindir}/pai
|
||||
%{_sbindir}/qetharp
|
||||
%{_sbindir}/qethconf
|
||||
%{_sbindir}/qethqoat
|
||||
%{_sbindir}/scsi_logging_level
|
||||
%{_sbindir}/sclpdbf
|
||||
%{_sbindir}/start_hsnc.sh
|
||||
%{_sbindir}/tape390_crypt
|
||||
|
|
@ -639,31 +515,23 @@ For more information refer to the following publications:
|
|||
%{_sbindir}/zfcpdbf
|
||||
%{_sbindir}/zgetdump
|
||||
%{_sbindir}/zipl-switch-to-blscfg
|
||||
%{_sbindir}/zmemtopo
|
||||
%{_sbindir}/znetconf
|
||||
%{_sbindir}/zpcictl
|
||||
%{_bindir}/cpacfinfo
|
||||
%{_bindir}/dump2tar
|
||||
%{_bindir}/genprotimg
|
||||
%{_bindir}/mk-s390image
|
||||
%{_bindir}/pvapconfig
|
||||
%{_bindir}/pvimg
|
||||
%{_bindir}/pvinfo
|
||||
%{_bindir}/pvattest
|
||||
%{_bindir}/pvextract-hdr
|
||||
%if %{with rust}
|
||||
%{_bindir}/pvsecret
|
||||
%{_bindir}/pvverify
|
||||
%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/*
|
||||
%{_sysusersdir}/s390utils-base.conf
|
||||
/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
|
||||
|
|
@ -679,43 +547,31 @@ For more information refer to the following publications:
|
|||
%dir %{_libdir}/zkey
|
||||
%{_libdir}/zkey/zkey-ekmfweb.so
|
||||
%{_libdir}/zkey/zkey-kmip.so
|
||||
%{_mandir}/man1/cpacfinfo.1*
|
||||
%{_mandir}/man1/dump2tar.1*
|
||||
%{_mandir}/man1/genprotimg.1*
|
||||
%{_mandir}/man1/mk-s390image.1*
|
||||
%{_mandir}/man1/pvapconfig.1*
|
||||
%{_mandir}/man1/pvattest.1*
|
||||
%{_mandir}/man1/pvattest-check.1*
|
||||
%{_mandir}/man1/pvattest-create.1*
|
||||
%{_mandir}/man1/pvattest-perform.1*
|
||||
%{_mandir}/man1/pvattest-verify.1*
|
||||
%{_mandir}/man1/pvimg.1*
|
||||
%{_mandir}/man1/pvimg-create.1*
|
||||
%{_mandir}/man1/pvimg-info.1*
|
||||
%{_mandir}/man1/pvimg-test.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-retrievable.1*
|
||||
%{_mandir}/man1/pvsecret-create-update-cck.1*
|
||||
%{_mandir}/man1/pvsecret-create.1*
|
||||
%{_mandir}/man1/pvsecret-list.1*
|
||||
%{_mandir}/man1/pvsecret-lock.1*
|
||||
%{_mandir}/man1/pvsecret-retrieve.1*
|
||||
%{_mandir}/man1/pvsecret-verify.1*
|
||||
%{_mandir}/man1/pvsecret-version.1*
|
||||
%{_mandir}/man1/pvsecret.1*
|
||||
%{_mandir}/man1/pvverify.1*
|
||||
%endif
|
||||
%{_mandir}/man1/zkey.1*
|
||||
%{_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*
|
||||
%{_mandir}/man8/chchp.8*
|
||||
%{_mandir}/man8/chcpumf.8*
|
||||
%{_mandir}/man8/chpstat.8*
|
||||
%{_mandir}/man8/chshut.8*
|
||||
%{_mandir}/man8/chzcrypt.8*
|
||||
%{_mandir}/man8/dasdstat.8*
|
||||
|
|
@ -731,7 +587,6 @@ For more information refer to the following publications:
|
|||
%{_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*
|
||||
|
|
@ -740,7 +595,6 @@ For more information refer to the following publications:
|
|||
%{_mandir}/man8/lstape.8*
|
||||
%{_mandir}/man8/lszcrypt.8*
|
||||
%{_mandir}/man8/lszfcp.8*
|
||||
%{_mandir}/man8/opticsmon.8*
|
||||
%{_mandir}/man8/pai.8*
|
||||
%{_mandir}/man8/qetharp.8*
|
||||
%{_mandir}/man8/qethconf.8*
|
||||
|
|
@ -755,13 +609,11 @@ For more information refer to the following publications:
|
|||
%{_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/genprotimg/
|
||||
%{_datadir}/s390-tools/netboot/
|
||||
%{bash_completions_dir}/*.bash
|
||||
%{zsh_completions_dir}/_*
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip/profiles
|
||||
|
|
@ -772,25 +624,11 @@ For more information refer to the following publications:
|
|||
# Additional Fedora/RHEL specific stuff
|
||||
/boot/tape0
|
||||
|
||||
%package se-data
|
||||
License: MIT
|
||||
Summary: Data for Secure Execution
|
||||
Provides: s390-tools-se-data = %{epoch}:%{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description se-data
|
||||
%{summary}.
|
||||
|
||||
%files se-data
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/pvimg/
|
||||
|
||||
#
|
||||
# *********************** s390-tools osasnmpd package ***********************
|
||||
#
|
||||
%package osasnmpd
|
||||
Summary: SNMP sub-agent for OSA-Express cards
|
||||
Provides: s390-tools-osasnmpd = %{epoch}:%{version}-%{release}
|
||||
Requires: net-snmp
|
||||
Requires: psmisc
|
||||
BuildRequires: net-snmp-devel
|
||||
|
|
@ -810,7 +648,6 @@ ATM Ethernet LAN Emulation in QDIO mode.
|
|||
#
|
||||
%package mon_statd
|
||||
Summary: Monitoring daemons for Linux in z/VM
|
||||
Provides: s390-tools-mon_statd = %{epoch}:%{version}-%{release}
|
||||
Requires: coreutils
|
||||
%{?systemd_requires}
|
||||
|
||||
|
|
@ -850,7 +687,6 @@ Monitoring daemons for Linux in z/VM:
|
|||
#
|
||||
%package cpuplugd
|
||||
Summary: Daemon that manages CPU and memory resources
|
||||
Provides: s390-tools-cpuplugd = %{epoch}:%{version}-%{release}
|
||||
%{?systemd_requires}
|
||||
BuildRequires: systemd
|
||||
|
||||
|
|
@ -880,7 +716,6 @@ memory can be increased or decreased exploiting the CMM1 feature.
|
|||
#
|
||||
%package ziomon
|
||||
Summary: S390 ziomon tools
|
||||
Provides: s390-tools-ziomon = %{epoch}:%{version}-%{release}
|
||||
Requires: blktrace
|
||||
Requires: coreutils
|
||||
Requires: device-mapper-multipath
|
||||
|
|
@ -919,7 +754,6 @@ Tool set to collect data for zfcp performance analysis and report.
|
|||
#
|
||||
%package iucvterm
|
||||
Summary: z/VM IUCV terminal applications
|
||||
Provides: s390-tools-iucvterm = %{epoch}:%{version}-%{release}
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): grep
|
||||
Requires(postun): grep
|
||||
|
|
@ -936,6 +770,10 @@ active TCP/IP connection between two Linux guest operating systems.
|
|||
- ts-shell: Terminal server shell to authorize and control IUCV terminal
|
||||
connections for individual Linux users.
|
||||
|
||||
%pre iucvterm
|
||||
# check for ts-shell group and create it
|
||||
getent group ts-shell > /dev/null || groupadd -r ts-shell
|
||||
|
||||
%post iucvterm
|
||||
# /etc/shells is provided by "setup"
|
||||
grep -q '^/usr/bin/ts-shell$' /etc/shells \
|
||||
|
|
@ -961,16 +799,13 @@ fi
|
|||
%{_bindir}/ts-shell
|
||||
%{_sbindir}/chiucvallow
|
||||
%{_sbindir}/lsiucvallow
|
||||
%{_sysusersdir}/s390utils-iucvterm.conf
|
||||
%{_tmpfilesdir}/s390utils-iucvterm.conf
|
||||
%ghost %dir %attr(2770,root,ts-shell) /var/log/ts-shell
|
||||
%dir %attr(2770,root,ts-shell) /var/log/ts-shell
|
||||
%doc iucvterm/doc/ts-shell
|
||||
%{_mandir}/man1/iucvconn.1*
|
||||
%{_mandir}/man1/iucvtty.1*
|
||||
%{_mandir}/man1/ts-shell.1*
|
||||
%{_mandir}/man7/af_iucv.7*
|
||||
%{_mandir}/man8/chiucvallow.8*
|
||||
%{_mandir}/man8/lsiucvallow.8*
|
||||
%{_mandir}/man9/hvc_iucv.9*
|
||||
%{_unitdir}/iucvtty-login@.service
|
||||
%{_unitdir}/ttyrun-getty@.service
|
||||
|
|
@ -983,7 +818,6 @@ fi
|
|||
Summary: CMS file system based on FUSE
|
||||
BuildRequires: fuse3-devel
|
||||
Requires: fuse3
|
||||
Provides: s390-tools-cmsfs-fuse = %{epoch}:%{version}-%{release}
|
||||
Requires: glibc-gconv-extra
|
||||
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
|
||||
|
||||
|
|
@ -1004,7 +838,6 @@ Summary: z/OS data set access based on FUSE
|
|||
BuildRequires: fuse3-devel
|
||||
BuildRequires: libcurl-devel
|
||||
Requires: fuse3
|
||||
Provides: s390-tools-zdsfs = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description zdsfs
|
||||
This package contains the z/OS data set access based on FUSE.
|
||||
|
|
@ -1020,7 +853,6 @@ This package contains the z/OS data set access based on FUSE.
|
|||
Summary: HMC drive file system based on FUSE
|
||||
BuildRequires: fuse3-devel
|
||||
Requires: fuse3
|
||||
Provides: s390-tools-hmcdrvfs = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description hmcdrvfs
|
||||
This package contains a HMC drive file system based on FUSE and a tool
|
||||
|
|
@ -1037,7 +869,6 @@ to list files and directories.
|
|||
#
|
||||
%package cpacfstatsd
|
||||
Summary: Monitor and maintain CPACF activity counters
|
||||
Provides: s390-tools-cpacfstatsd = %{epoch}:%{version}-%{release}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
|
@ -1058,13 +889,15 @@ and maintain CPACF activity counters.
|
|||
%postun cpacfstatsd
|
||||
%systemd_postun_with_restart cpacfstatsd.service
|
||||
|
||||
%pre cpacfstatsd
|
||||
getent group cpacfstats >/dev/null || groupadd -r cpacfstats
|
||||
|
||||
%files cpacfstatsd
|
||||
%{_bindir}/cpacfstats
|
||||
%{_sbindir}/cpacfstatsd
|
||||
%{_mandir}/man1/cpacfstats.1*
|
||||
%{_mandir}/man8/cpacfstatsd.8*
|
||||
%{_unitdir}/cpacfstatsd.service
|
||||
%{_sysusersdir}/s390utils-cpacfstatsd.conf
|
||||
|
||||
#
|
||||
# *********************** chreipl-fcp-mpath package ***********************
|
||||
|
|
@ -1080,7 +913,6 @@ BuildRequires: pandoc
|
|||
BuildRequires: gawk
|
||||
BuildRequires: gzip
|
||||
BuildRequires: sed
|
||||
Provides: s390-tools-chreipl-fcp-mpath = %{epoch}:%{version}-%{release}
|
||||
Requires: bash
|
||||
Requires: coreutils
|
||||
Requires: util-linux
|
||||
|
|
@ -1115,7 +947,7 @@ reconfigures the FCP re-IPL settings to use an operational path.
|
|||
#
|
||||
%package devel
|
||||
Summary: Development files
|
||||
Provides: s390-tools-devel = %{epoch}:%{version}-%{release}
|
||||
|
||||
Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -1128,91 +960,8 @@ User-space development files for the s390/s390x architecture.
|
|||
%{_libdir}/libekmfweb.so
|
||||
%{_libdir}/libkmipclient.so
|
||||
|
||||
#
|
||||
# end of s390x specific sub-packages
|
||||
#
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 06 2026 Dan Horák <dan[at]danny.cz> - 2:2.40.0-1
|
||||
- rebased to 2.40.0 (rhbz#2421447)
|
||||
|
||||
* Thu Nov 13 2025 Dan Horák <dan[at]danny.cz> - 2:2.39.0-1
|
||||
- rebased to 2.39.0 (rhbz#2403755)
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.38.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jun 27 2025 Dan Horák <dan[at]danny.cz> - 2:2.38.0-1
|
||||
- rebased to 2.38.0 (rhbz#2374765)
|
||||
|
||||
* Thu Mar 13 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 2:2.37.0-2
|
||||
- Properly generate Rust BuildRequires on Fedora
|
||||
- Update License (for s390utils/s390utils-base) to reflect Rust deps.
|
||||
|
||||
* Thu Feb 27 2025 Jakub Čajka <jcajka@redhat.com> - 2:2.37.0-1
|
||||
- rebased to 2.37.0 (rhbz#2330787)
|
||||
|
||||
* Mon Feb 24 2025 Dan Horák <dan[at]danny.cz> - 2:2.36.0-1
|
||||
- rebased to 2.36.0 (rhbz#2330787)
|
||||
|
||||
* Thu Feb 06 2025 Fabio Valentini <decathorpe@gmail.com> - 2:2.35.0-5
|
||||
- Rebuild for openssl crate >= v0.10.70 (RUSTSEC-2025-0004)
|
||||
|
||||
* Mon Jan 20 2025 Dan Horák <dan[at]danny.cz> - 2:2.35.0-4
|
||||
- fix build with gcc15
|
||||
- Resolves: rhbz#2338176
|
||||
|
||||
* Wed Jan 15 2025 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 2:2.35.0-3
|
||||
- Add sysusers.d config
|
||||
|
||||
* Tue Jan 14 2025 Dan Horák <dan[at]danny.cz> - 2:2.35.0-2
|
||||
- updated for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
|
||||
|
||||
* Thu Oct 03 2024 Dan Horák <dan[at]danny.cz> - 2:2.35.0-1
|
||||
- rebased to 2.35.0 (rhbz#2316232)
|
||||
|
||||
* Mon Aug 26 2024 Dan Horák <dan[at]danny.cz> - 2:2.34.0-2
|
||||
- don't make Rust warnings fatal
|
||||
|
||||
* Mon Aug 12 2024 Dan Horák <dan[at]danny.cz> - 2:2.34.0-1
|
||||
- rebased to 2.34.0 (rhbz#2302462)
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.33.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jul 15 2024 Dan Horák <dan[at]danny.cz> - 2:2.33.1-3
|
||||
- "which" is not required any more
|
||||
- Revert "zipl/src: Fix problems when target parameters are specified by user"
|
||||
|
||||
* Thu Jun 20 2024 Dan Horák <dan[at]danny.cz> - 2:2.33.1-2
|
||||
- add which as a dependency for base and ziomon subpackages (RHEL-38488)
|
||||
|
||||
* Tue May 28 2024 Dan Horák <dan[at]danny.cz> - 2:2.33.1-1
|
||||
- rebased to 2.33.1 (rhbz#2283542)
|
||||
|
||||
* Thu Apr 04 2024 Dan Horák <dan[at]danny.cz> - 2:2.32.0-1
|
||||
- rebased to 2.32.0 (rhbz#2273003)
|
||||
|
||||
* Fri Mar 08 2024 Neal Gompa <ngompa@fedoraproject.org> - 2:2.31.0-2
|
||||
- Add 's390-tools' Provides to all packages
|
||||
|
||||
* Mon Feb 05 2024 Dan Horák <dan[at]danny.cz> - 2:2.31.0-1
|
||||
- rebased to 2.31.0 (rhbz#2262499)
|
||||
|
||||
* Thu Jan 25 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-2
|
||||
- add s390utils-se-data as a noarch subpackage with Secure Execution data files
|
||||
|
||||
* Tue Jan 02 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-1
|
||||
- rebased to 2.30.0 (rhbz#2252519)
|
||||
|
||||
* Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 2:2.29.0-6
|
||||
- Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072)
|
||||
|
||||
* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-5
|
||||
- enable multi-arch build
|
||||
|
||||
* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-4
|
||||
- fix upstream kernel installations
|
||||
|
||||
|
|
|
|||
12
snmp-semicolon.patch
Normal file
12
snmp-semicolon.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -ruNp a/osasnmpd/ibmOSAMib.h b/osasnmpd/ibmOSAMib.h
|
||||
--- a/osasnmpd/ibmOSAMib.h 2023-08-30 20:13:41.231150334 +0200
|
||||
+++ b/osasnmpd/ibmOSAMib.h 2023-08-30 20:13:27.414030798 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
/* we may use header_generic and header_simple_table from the util_funcs module */
|
||||
|
||||
-config_require(util_funcs)
|
||||
+config_require(util_funcs);
|
||||
|
||||
|
||||
/* function prototypes */
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (s390-tools-2.40.0.tar.gz) = 1943429581b280bf9ea370da3700a234d509837cb45b2354cdf79b38db87d2183010d18d9132defd77b9d8e11b7e002c447ffd7c912e20a50da4cb6877758c0e
|
||||
SHA512 (s390-tools-2.40.0-rust-vendor.tar.xz) = fd1894c4e950a3c51054432731a3aeef4318e794aa4af2dc5fed31da16dce2020f014a64241e44766fb40b0fd6c1ac5943366e38dcfebf264875220ecf1285b5
|
||||
SHA512 (s390-tools-2.29.0.tar.gz) = 3eeaab0e0c6559b9fb0b4c7cca49358a7cc7fe0cb11684d2d761fe105cc2bfd791d33ecc2070e3dfd877039b68e868699cd3cea318e64aee1cc0f348c7b41617
|
||||
SHA512 (s390-tools-2.29.0-rust-vendor.tar.xz) = 7ee717c5848e7b59c3e11ef6b461122e5f1195e67d11e378352b297926b498180222bfc23719d952fb11677a3fd440d299e0035ca6ab0c6d784573e9a5698594
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue