Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
93479b677f | ||
|
882b26e468 | ||
|
0226a1b211 | ||
|
3eddb1a036 | ||
|
ad9e1ad7a0 | ||
|
0f03699129 | ||
|
f00ff2ac55 | ||
|
2c0b6d2ea2 | ||
|
8a3c26800a | ||
|
ca71fe340e | ||
|
7a5c89e84a | ||
|
40db3a57ae | ||
|
70bd1af9bd | ||
|
51cd104ddd | ||
|
5184801f0e | ||
|
535cc10766 | ||
|
3b4ba770c1 | ||
|
702b044c20 | ||
|
3fa397e687 | ||
|
9e549c2e6c | ||
|
087a10568c | ||
|
262d603726 | ||
|
4b655c64f1 | ||
|
d81d4fd383 | ||
|
da9838c800 | ||
|
b43bfd7eed | ||
|
a6e30a308a | ||
|
57b37fee1f | ||
|
d6f3723e10 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ src_vipa-2.0.4.tar.gz
|
|||||||
/src_vipa-2.1.0.tar.gz
|
/src_vipa-2.1.0.tar.gz
|
||||||
/s390-tools-*.tar.bz2
|
/s390-tools-*.tar.bz2
|
||||||
/s390-tools-*.tar.gz
|
/s390-tools-*.tar.gz
|
||||||
|
/s390-tools-*-rust-vendor.tar.xz
|
||||||
|
@ -54,21 +54,25 @@ EOF
|
|||||||
case "$COMMAND" in
|
case "$COMMAND" in
|
||||||
add)
|
add)
|
||||||
if [[ "${KERNEL_DIR}" != "/boot" ]]; then
|
if [[ "${KERNEL_DIR}" != "/boot" ]]; then
|
||||||
|
# rename to match the name used in the pseudo-BLS snippet above
|
||||||
|
cp --remove-destination --preserve=timestamps -T "${KERNEL_IMAGE}" "/boot/vmlinuz-${KERNEL_VERSION}"
|
||||||
|
command -v restorecon &>/dev/null && \
|
||||||
|
restorecon -R "/boot/vmlinuz-${KERNEL_VERSION}"
|
||||||
|
|
||||||
for i in \
|
for i in \
|
||||||
"$KERNEL_IMAGE" \
|
|
||||||
"$KERNEL_DIR"/System.map \
|
"$KERNEL_DIR"/System.map \
|
||||||
"$KERNEL_DIR"/config \
|
"$KERNEL_DIR"/config \
|
||||||
"$KERNEL_DIR"/zImage.stub
|
"$KERNEL_DIR"/zImage.stub
|
||||||
do
|
do
|
||||||
[[ -e "$i" ]] || continue
|
[[ -e "$i" ]] || continue
|
||||||
cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
|
cp --preserve=timestamps -T "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
|
||||||
command -v restorecon &>/dev/null && \
|
command -v restorecon &>/dev/null && \
|
||||||
restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
|
restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
|
||||||
done
|
done
|
||||||
# hmac is .vmlinuz-<version>.hmac so needs a special treatment
|
# hmac is .vmlinuz-<version>.hmac so needs a special treatment
|
||||||
i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
|
i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
|
||||||
if [[ -e "$i" ]]; then
|
if [[ -e "$i" ]]; then
|
||||||
cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
cp --preserve=timestamps "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
||||||
command -v restorecon &>/dev/null && \
|
command -v restorecon &>/dev/null && \
|
||||||
restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
||||||
fi
|
fi
|
||||||
@ -91,7 +95,7 @@ case "$COMMAND" in
|
|||||||
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
|
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
|
||||||
BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
|
BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
|
||||||
if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
|
if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
|
||||||
cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
|
cp --preserve=timestamps -T "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
|
||||||
sed -i -e "s,^linux.*,linux /boot/vmlinuz-${KERNEL_VERSION},g" "${BLS_TARGET}"
|
sed -i -e "s,^linux.*,linux /boot/vmlinuz-${KERNEL_VERSION},g" "${BLS_TARGET}"
|
||||||
sed -i -e "s,^initrd.*,initrd /boot/initramfs-${KERNEL_VERSION}.img,g" "${BLS_TARGET}"
|
sed -i -e "s,^initrd.*,initrd /boot/initramfs-${KERNEL_VERSION}.img,g" "${BLS_TARGET}"
|
||||||
sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_TARGET}"
|
sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_TARGET}"
|
||||||
@ -112,7 +116,7 @@ case "$COMMAND" in
|
|||||||
|
|
||||||
if [ "x${MAKEDEBUG}" = "xyes" ]; then
|
if [ "x${MAKEDEBUG}" = "xyes" ]; then
|
||||||
BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
||||||
cp -aT "${BLS_TARGET}" "${BLS_DEBUG}"
|
cp --preserve=timestamps -T "${BLS_TARGET}" "${BLS_DEBUG}"
|
||||||
TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
|
TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
|
||||||
VERSION="$(grep '^version[ \t]' "${BLS_DEBUG}" | sed -e 's/^version[ \t]*//')"
|
VERSION="$(grep '^version[ \t]' "${BLS_DEBUG}" | sed -e 's/^version[ \t]*//')"
|
||||||
BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
||||||
|
8
rpminspect.yaml
Normal file
8
rpminspect.yaml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
pathmigration:
|
||||||
|
excluded_paths:
|
||||||
|
- /lib/s390-tools
|
||||||
|
|
||||||
|
badfuncs:
|
||||||
|
ignore:
|
||||||
|
- /usr/sbin/qethqoat
|
@ -1,4 +1,4 @@
|
|||||||
From a17c57bf2b7b6d64a509cb5fb02fe46849bc550c Mon Sep 17 00:00:00 2001
|
From b2daaa34776ba6afec879e362378f6f7563590a6 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||||
Date: Mon, 20 Jun 2022 17:43:05 +0200
|
Date: Mon, 20 Jun 2022 17:43:05 +0200
|
||||||
Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
|
Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
|
||||||
@ -194,10 +194,10 @@ index 0cea1d4..9352f76 100644
|
|||||||
return n;
|
return n;
|
||||||
|
|
||||||
--
|
--
|
||||||
2.37.3
|
2.39.2
|
||||||
|
|
||||||
|
|
||||||
From 7a51cfc15b870d90bffe1e24a1da922663ffe1d7 Mon Sep 17 00:00:00 2001
|
From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
|
||||||
From: Peter Jones <pjones@redhat.com>
|
From: Peter Jones <pjones@redhat.com>
|
||||||
Date: Mon, 20 Jun 2022 17:46:59 +0200
|
Date: Mon, 20 Jun 2022 17:46:59 +0200
|
||||||
Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
|
Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
|
||||||
@ -213,7 +213,7 @@ Signed-off-by: Dan Horák <dan@danny.cz>
|
|||||||
2 files changed, 95 insertions(+), 2 deletions(-)
|
2 files changed, 95 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/zipl/src/Makefile b/zipl/src/Makefile
|
diff --git a/zipl/src/Makefile b/zipl/src/Makefile
|
||||||
index 64eabe4..7043005 100644
|
index cab5655..7ec215d 100644
|
||||||
--- a/zipl/src/Makefile
|
--- a/zipl/src/Makefile
|
||||||
+++ b/zipl/src/Makefile
|
+++ b/zipl/src/Makefile
|
||||||
@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
||||||
@ -223,7 +223,7 @@ index 64eabe4..7043005 100644
|
|||||||
+ -lrpmio -lrpm
|
+ -lrpmio -lrpm
|
||||||
|
|
||||||
objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
|
objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
|
||||||
bootmap_header.o envblk.o install.o zipl.o $(rootdir)/zipl/boot/data.o
|
bootmap_header.o envblk.o install.o zipl.o
|
||||||
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||||
index 9352f76..3327e2d 100644
|
index 9352f76..3327e2d 100644
|
||||||
--- a/zipl/src/scan.c
|
--- a/zipl/src/scan.c
|
||||||
@ -344,5 +344,5 @@ index 9352f76..3327e2d 100644
|
|||||||
static int
|
static int
|
||||||
scan_append_section_heading(struct scan_token* scan, int* index, char* name);
|
scan_append_section_heading(struct scan_token* scan, int* index, char* name);
|
||||||
--
|
--
|
||||||
2.37.3
|
2.39.2
|
||||||
|
|
||||||
|
@ -1,77 +0,0 @@
|
|||||||
From d721eb018973842a432869f6f9efd5752b2e7f19 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
||||||
Date: Mon, 19 Dec 2022 09:51:51 +0000
|
|
||||||
Subject: [PATCH 1/2] zgetdump/Makefile: don't use `.check_dep_zgetdump` as
|
|
||||||
linker input
|
|
||||||
|
|
||||||
The `.check_dep_zgetdump` file is used to cache the result of the
|
|
||||||
dependency checks and should not be used as input for linking or
|
|
||||||
anything else. Let's add it as dependency for the objects file. This
|
|
||||||
shouldn't cause any problems since the Makefile rule for object files is
|
|
||||||
defined in `common.mak` as follows:
|
|
||||||
|
|
||||||
%.o: %.c
|
|
||||||
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
|
|
||||||
|
|
||||||
Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/147
|
|
||||||
Fixes: 8d8d5e9746a4 ("zdump: Fix Makefile dependencies")
|
|
||||||
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
||||||
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
|
|
||||||
Signed-off-by: Jan Hoeppner <hoeppner@linux.ibm.com>
|
|
||||||
---
|
|
||||||
zdump/Makefile | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/zdump/Makefile b/zdump/Makefile
|
|
||||||
index ca8aadc..934dc47 100644
|
|
||||||
--- a/zdump/Makefile
|
|
||||||
+++ b/zdump/Makefile
|
|
||||||
@@ -119,7 +119,9 @@ libs = $(rootdir)/libutil/libutil.a $(LIBPV)
|
|
||||||
|
|
||||||
all: $(BUILD_TARGETS)
|
|
||||||
|
|
||||||
-zgetdump: .check_dep_zgetdump $(OBJECTS) $(libs)
|
|
||||||
+$(OBJECTS): .check_dep_zgetdump
|
|
||||||
+
|
|
||||||
+zgetdump: $(OBJECTS) $(libs)
|
|
||||||
|
|
||||||
skip-zgetdump:
|
|
||||||
echo " SKIP zgetdump due to unresolved dependencies"
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
||||||
|
|
||||||
From d9f54f76e2e6f17e0b5bafdc0d09ff0e72edd474 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
||||||
Date: Fri, 20 Jan 2023 11:04:18 +0100
|
|
||||||
Subject: [PATCH 2/2] zkey: Support EP11 host library version 4
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Try to load libep11.so.4 if available, but fallback to older
|
|
||||||
library versions if not.
|
|
||||||
|
|
||||||
Reviewed-by: Jörg Schmidbauer <jschmidb@de.ibm.com>
|
|
||||||
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
||||||
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
|
|
||||||
---
|
|
||||||
zkey/ep11.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/zkey/ep11.c b/zkey/ep11.c
|
|
||||||
index 58dc3c5..8359929 100644
|
|
||||||
--- a/zkey/ep11.c
|
|
||||||
+++ b/zkey/ep11.c
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
* Definitions for the EP11 library
|
|
||||||
*/
|
|
||||||
#define EP11_LIBRARY_NAME "libep11.so"
|
|
||||||
-#define EP11_LIBRARY_VERSION 3
|
|
||||||
+#define EP11_LIBRARY_VERSION 4
|
|
||||||
#define EP11_WEB_PAGE "http://www.ibm.com/security/cryptocards"
|
|
||||||
|
|
||||||
/**
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
0
s390utils-2.31.0-fedora.patch
Normal file
0
s390utils-2.31.0-fedora.patch
Normal file
266
s390utils.spec
266
s390utils.spec
@ -1,21 +1,30 @@
|
|||||||
# secure boot support is for RHEL only
|
# secure boot support is for RHEL only
|
||||||
%if 0%{?rhel} >= 8
|
%if 0%{?rhel} >= 8
|
||||||
%global signzipl 1
|
%bcond_without signzipl
|
||||||
|
%else
|
||||||
|
%bcond_with signzipl
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%global with_pandoc 1
|
%bcond_without pandoc
|
||||||
|
%else
|
||||||
|
%bcond_with pandoc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: s390utils
|
Name: s390utils
|
||||||
Summary: Utilities and daemons for IBM z Systems
|
Summary: Utilities and daemons for IBM z Systems
|
||||||
Version: 2.25.0
|
Version: 2.31.0
|
||||||
Release: 4%{?dist}
|
Release: 2%{?dist}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
License: MIT
|
# MIT covers nearly all the files, except init files
|
||||||
ExclusiveArch: s390 s390x
|
License: MIT AND LGPL-2.1-or-later
|
||||||
URL: https://github.com/ibm-s390-linux/s390-tools
|
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
|
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 ; \
|
||||||
|
# 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
|
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
|
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
|
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
|
Source24: 52-zipl-rescue.install
|
||||||
Source25: 91-zipl.install
|
Source25: 91-zipl.install
|
||||||
|
|
||||||
%if 0%{?signzipl}
|
%if %{with signzipl}
|
||||||
%define pesign_name redhatsecureboot302
|
%define pesign_name redhatsecureboot302
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -38,8 +47,18 @@ Patch0: s390-tools-zipl-invert-script-options.patch
|
|||||||
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
|
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
|
||||||
|
|
||||||
# upstream fixes/updates
|
# upstream fixes/updates
|
||||||
Patch100: s390utils-%%{version}-fedora.patch
|
#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-core = %{epoch}:%{version}-%{release}
|
||||||
Requires: s390utils-base = %{epoch}:%{version}-%{release}
|
Requires: s390utils-base = %{epoch}:%{version}-%{release}
|
||||||
Requires: s390utils-osasnmpd = %{epoch}:%{version}-%{release}
|
Requires: s390utils-osasnmpd = %{epoch}:%{version}-%{release}
|
||||||
@ -47,9 +66,48 @@ Requires: s390utils-cpuplugd = %{epoch}:%{version}-%{release}
|
|||||||
Requires: s390utils-mon_statd = %{epoch}:%{version}-%{release}
|
Requires: s390utils-mon_statd = %{epoch}:%{version}-%{release}
|
||||||
Requires: s390utils-iucvterm = %{epoch}:%{version}-%{release}
|
Requires: s390utils-iucvterm = %{epoch}:%{version}-%{release}
|
||||||
Requires: s390utils-ziomon = %{epoch}:%{version}-%{release}
|
Requires: s390utils-ziomon = %{epoch}:%{version}-%{release}
|
||||||
|
%else
|
||||||
|
#
|
||||||
|
# multiarch package structure
|
||||||
|
#
|
||||||
|
Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: glib2-devel
|
||||||
|
%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(lazy_static)
|
||||||
|
BuildRequires: crate(libc)
|
||||||
|
BuildRequires: crate(log)
|
||||||
|
BuildRequires: crate(mockito)
|
||||||
|
BuildRequires: crate(openssl)
|
||||||
|
BuildRequires: crate(openssl-probe)
|
||||||
|
BuildRequires: crate(serde)
|
||||||
|
BuildRequires: crate(serde_derive)
|
||||||
|
BuildRequires: crate(serde_test)
|
||||||
|
BuildRequires: crate(serde_yaml)
|
||||||
|
BuildRequires: crate(strsim)
|
||||||
|
BuildRequires: crate(terminal_size)
|
||||||
|
BuildRequires: crate(thiserror)
|
||||||
|
BuildRequires: crate(zerocopy)
|
||||||
|
BuildRequires: rust-packaging
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This is a meta package for installing the default s390-tools sub packages.
|
This is a meta package for installing the default s390-tools sub packages.
|
||||||
@ -60,27 +118,22 @@ The s390utils packages contain a set of user space utilities that should to
|
|||||||
be used together with the zSeries (s390) Linux kernel and device drivers.
|
be used together with the zSeries (s390) Linux kernel and device drivers.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n s390-tools-%{version}
|
%autosetup -n s390-tools-%{version} -p1
|
||||||
|
|
||||||
# Fedora/RHEL changes
|
|
||||||
%patch0 -p1 -b .zipl-invert-script-options
|
|
||||||
%patch1 -p1 -b .blscfg-rpm-nvr-sort
|
|
||||||
|
|
||||||
# upstream fixes/updates
|
|
||||||
%patch100 -p1
|
|
||||||
|
|
||||||
# drop -Werror from genprotimg to allow building with GCC 12
|
|
||||||
sed -i.bak -e 's/-Werror//g' genprotimg/src/Makefile genprotimg/boot/Makefile
|
|
||||||
|
|
||||||
# remove --strip from install
|
|
||||||
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
|
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
pushd rust
|
||||||
|
%cargo_prep -V 1
|
||||||
|
popd
|
||||||
|
%else
|
||||||
|
%cargo_prep
|
||||||
|
%endif
|
||||||
|
rm ./rust/Cargo.lock
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make \
|
make \
|
||||||
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
||||||
HAVE_DRACUT=1 \
|
HAVE_DRACUT=1 \
|
||||||
%if 0%{?with_pandoc}
|
%if %{with pandoc}
|
||||||
ENABLE_DOC=1 \
|
ENABLE_DOC=1 \
|
||||||
%endif
|
%endif
|
||||||
NO_PIE_LDFLAGS="" \
|
NO_PIE_LDFLAGS="" \
|
||||||
@ -92,7 +145,7 @@ make \
|
|||||||
%install
|
%install
|
||||||
make install \
|
make install \
|
||||||
HAVE_DRACUT=1 \
|
HAVE_DRACUT=1 \
|
||||||
%if 0%{?with_pandoc}
|
%if %{with pandoc}
|
||||||
ENABLE_DOC=1 \
|
ENABLE_DOC=1 \
|
||||||
%endif
|
%endif
|
||||||
DESTDIR=%{buildroot} \
|
DESTDIR=%{buildroot} \
|
||||||
@ -101,8 +154,12 @@ make install \
|
|||||||
DISTRELEASE=%{release} \
|
DISTRELEASE=%{release} \
|
||||||
V=1
|
V=1
|
||||||
|
|
||||||
|
%ifarch s390x
|
||||||
|
#
|
||||||
|
# s390x/native specific %%install section
|
||||||
|
#
|
||||||
# sign the stage3 bootloader
|
# sign the stage3 bootloader
|
||||||
%if 0%{?signzipl}
|
%if %{with signzipl}
|
||||||
if [ -x /usr/bin/rpm-sign ]; then
|
if [ -x /usr/bin/rpm-sign ]; then
|
||||||
pushd %{buildroot}/lib/s390-tools/
|
pushd %{buildroot}/lib/s390-tools/
|
||||||
rpm-sign --key "%{pesign_name}" --lkmsign stage3.bin --output stage3.signed
|
rpm-sign --key "%{pesign_name}" --lkmsign stage3.bin --output stage3.signed
|
||||||
@ -160,17 +217,61 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
|
|||||||
|
|
||||||
# zipl.conf to be ghosted
|
# zipl.conf to be ghosted
|
||||||
touch %{buildroot}%{_sysconfdir}/zipl.conf
|
touch %{buildroot}%{_sysconfdir}/zipl.conf
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch s390x
|
||||||
|
#
|
||||||
|
# s390x/native main %%files section
|
||||||
|
#
|
||||||
%files
|
%files
|
||||||
%doc README.md
|
%doc README.md
|
||||||
|
|
||||||
|
%else
|
||||||
|
#
|
||||||
|
# multiarch %%files section
|
||||||
|
#
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc README.md
|
||||||
|
%license LICENSE
|
||||||
|
%{_bindir}/genprotimg
|
||||||
|
%{_bindir}/pvapconfig
|
||||||
|
%{_bindir}/pvattest
|
||||||
|
%{_bindir}/pvextract-hdr
|
||||||
|
%{_bindir}/pvsecret
|
||||||
|
%{_mandir}/man1/genprotimg.1*
|
||||||
|
%{_mandir}/man1/pvapconfig.1*
|
||||||
|
%{_mandir}/man1/pvattest.1*
|
||||||
|
%{_mandir}/man1/pvattest-create.1*
|
||||||
|
%{_mandir}/man1/pvattest-perform.1*
|
||||||
|
%{_mandir}/man1/pvattest-verify.1*
|
||||||
|
%{_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-verify.1*
|
||||||
|
%{_mandir}/man1/pvsecret.1*
|
||||||
|
%dir %{_datadir}/s390-tools
|
||||||
|
%{_datadir}/s390-tools/genprotimg/
|
||||||
|
|
||||||
|
#
|
||||||
|
# enf of multi-arch section
|
||||||
|
#
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch s390x
|
||||||
|
#
|
||||||
|
# s390x specific sub-packages
|
||||||
|
#
|
||||||
#
|
#
|
||||||
# ************************* s390-tools core package *************************
|
# ************************* s390-tools core package *************************
|
||||||
#
|
#
|
||||||
%package core
|
%package core
|
||||||
License: MIT
|
License: MIT
|
||||||
Summary: S390 core tools
|
Summary: S390 core tools
|
||||||
|
Provides: s390-tools-core = %{epoch}:%{version}-%{release}
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
# BRs are covered via the base package
|
# BRs are covered via the base package
|
||||||
@ -192,7 +293,7 @@ This package provides minimal set of tools needed to system to boot.
|
|||||||
|
|
||||||
%files core
|
%files core
|
||||||
%doc README.md zdev/src/chzdev_usage.txt
|
%doc README.md zdev/src/chzdev_usage.txt
|
||||||
%doc LICENSE
|
%license LICENSE
|
||||||
%{_sbindir}/chreipl
|
%{_sbindir}/chreipl
|
||||||
%{_sbindir}/chzdev
|
%{_sbindir}/chzdev
|
||||||
%{_sbindir}/cio_ignore
|
%{_sbindir}/cio_ignore
|
||||||
@ -208,13 +309,17 @@ This package provides minimal set of tools needed to system to boot.
|
|||||||
/lib/s390-tools/cpictl
|
/lib/s390-tools/cpictl
|
||||||
/lib/s390-tools/stage3.bin
|
/lib/s390-tools/stage3.bin
|
||||||
/lib/s390-tools/zdev_id
|
/lib/s390-tools/zdev_id
|
||||||
|
/lib/s390-tools/zdev-from-dasd_mod.dasd
|
||||||
/lib/s390-tools/zdev-root-update
|
/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
|
/lib/s390-tools/zipl.conf
|
||||||
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
|
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
|
||||||
%config(noreplace) %{_sysconfdir}/ziplenv
|
%config(noreplace) %{_sysconfdir}/ziplenv
|
||||||
%{_unitdir}/cpi.service
|
%{_unitdir}/cpi.service
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/cpi
|
%config(noreplace) %{_sysconfdir}/sysconfig/cpi
|
||||||
/usr/lib/dracut/modules.d/95zdev/
|
/usr/lib/dracut/modules.d/95zdev/
|
||||||
|
/usr/lib/dracut/modules.d/95zdev-kdump/
|
||||||
%{_mandir}/man5/zipl.conf.5*
|
%{_mandir}/man5/zipl.conf.5*
|
||||||
%{_mandir}/man8/chreipl.8*
|
%{_mandir}/man8/chreipl.8*
|
||||||
%{_mandir}/man8/chzdev.8*
|
%{_mandir}/man8/chzdev.8*
|
||||||
@ -259,14 +364,16 @@ This package provides minimal set of tools needed to system to boot.
|
|||||||
#
|
#
|
||||||
|
|
||||||
%package base
|
%package base
|
||||||
License: MIT
|
License: MIT AND LGPL-2.1-or-later
|
||||||
Summary: S390 base tools
|
Summary: S390 base tools
|
||||||
|
Provides: s390-tools-base = %{epoch}:%{version}-%{release}
|
||||||
Requires: gawk sed coreutils
|
Requires: gawk sed coreutils
|
||||||
Requires: sg3_utils
|
Requires: sg3_utils
|
||||||
Requires: ethtool
|
Requires: ethtool
|
||||||
Requires: tar
|
Requires: tar
|
||||||
Requires: file
|
Requires: file
|
||||||
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -274,7 +381,6 @@ BuildRequires: glibc-static
|
|||||||
BuildRequires: cryptsetup-devel >= 2.0.3
|
BuildRequires: cryptsetup-devel >= 2.0.3
|
||||||
BuildRequires: json-c-devel
|
BuildRequires: json-c-devel
|
||||||
BuildRequires: rpm-devel
|
BuildRequires: rpm-devel
|
||||||
BuildRequires: glib2-devel
|
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
|
|
||||||
|
|
||||||
@ -340,11 +446,6 @@ s390 base tools. This collection provides the following utilities:
|
|||||||
* tunedasd:
|
* tunedasd:
|
||||||
Adjust tunable parameters on DASD devices.
|
Adjust tunable parameters on DASD devices.
|
||||||
|
|
||||||
* vmconvert:
|
|
||||||
Convert system dumps created by the z/VM VMDUMP command into dumps with
|
|
||||||
LKCD format. These LKCD dumps can then be analyzed with the dump analysis
|
|
||||||
tool lcrash.
|
|
||||||
|
|
||||||
* vmcp:
|
* vmcp:
|
||||||
Allows Linux users to send commands to the z/VM control program (CP).
|
Allows Linux users to send commands to the z/VM control program (CP).
|
||||||
The normal usage is to invoke vmcp with the command you want to
|
The normal usage is to invoke vmcp with the command you want to
|
||||||
@ -444,8 +545,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_sbindir}/lscss
|
%{_sbindir}/lscss
|
||||||
%{_sbindir}/lsdasd
|
%{_sbindir}/lsdasd
|
||||||
%{_sbindir}/lshwc
|
%{_sbindir}/lshwc
|
||||||
%{_sbindir}/lsqeth
|
|
||||||
%{_sbindir}/lsluns
|
%{_sbindir}/lsluns
|
||||||
|
%{_sbindir}/lsqeth
|
||||||
|
%{_sbindir}/lspai
|
||||||
%{_sbindir}/lsreipl
|
%{_sbindir}/lsreipl
|
||||||
%{_sbindir}/lsscm
|
%{_sbindir}/lsscm
|
||||||
%{_sbindir}/lsshut
|
%{_sbindir}/lsshut
|
||||||
@ -475,10 +577,11 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_sbindir}/zpcictl
|
%{_sbindir}/zpcictl
|
||||||
%{_bindir}/dump2tar
|
%{_bindir}/dump2tar
|
||||||
%{_bindir}/genprotimg
|
%{_bindir}/genprotimg
|
||||||
|
%{_bindir}/pvapconfig
|
||||||
%{_bindir}/mk-s390image
|
%{_bindir}/mk-s390image
|
||||||
%{_bindir}/pvattest
|
%{_bindir}/pvattest
|
||||||
%{_bindir}/pvextract-hdr
|
%{_bindir}/pvextract-hdr
|
||||||
%{_bindir}/vmconvert
|
%{_bindir}/pvsecret
|
||||||
%{_bindir}/zkey
|
%{_bindir}/zkey
|
||||||
%{_bindir}/zkey-cryptsetup
|
%{_bindir}/zkey-cryptsetup
|
||||||
%{_unitdir}/dumpconf.service
|
%{_unitdir}/dumpconf.service
|
||||||
@ -503,11 +606,19 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_libdir}/zkey/zkey-kmip.so
|
%{_libdir}/zkey/zkey-kmip.so
|
||||||
%{_mandir}/man1/dump2tar.1*
|
%{_mandir}/man1/dump2tar.1*
|
||||||
%{_mandir}/man1/genprotimg.1*
|
%{_mandir}/man1/genprotimg.1*
|
||||||
|
%{_mandir}/man1/pvapconfig.1*
|
||||||
%{_mandir}/man1/pvattest.1*
|
%{_mandir}/man1/pvattest.1*
|
||||||
%{_mandir}/man1/pvattest-create.1*
|
%{_mandir}/man1/pvattest-create.1*
|
||||||
%{_mandir}/man1/pvattest-perform.1*
|
%{_mandir}/man1/pvattest-perform.1*
|
||||||
%{_mandir}/man1/pvattest-verify.1*
|
%{_mandir}/man1/pvattest-verify.1*
|
||||||
%{_mandir}/man1/vmconvert.1*
|
%{_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-verify.1*
|
||||||
|
%{_mandir}/man1/pvsecret.1*
|
||||||
%{_mandir}/man1/zkey.1*
|
%{_mandir}/man1/zkey.1*
|
||||||
%{_mandir}/man1/zkey-cryptsetup.1*
|
%{_mandir}/man1/zkey-cryptsetup.1*
|
||||||
%{_mandir}/man1/zkey-ekmfweb.1*
|
%{_mandir}/man1/zkey-ekmfweb.1*
|
||||||
@ -532,6 +643,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_mandir}/man8/lsdasd.8*
|
%{_mandir}/man8/lsdasd.8*
|
||||||
%{_mandir}/man8/lshwc.8*
|
%{_mandir}/man8/lshwc.8*
|
||||||
%{_mandir}/man8/lsluns.8*
|
%{_mandir}/man8/lsluns.8*
|
||||||
|
%{_mandir}/man8/lspai.8*
|
||||||
%{_mandir}/man8/lsqeth.8*
|
%{_mandir}/man8/lsqeth.8*
|
||||||
%{_mandir}/man8/lsreipl.8*
|
%{_mandir}/man8/lsreipl.8*
|
||||||
%{_mandir}/man8/lsscm.8*
|
%{_mandir}/man8/lsscm.8*
|
||||||
@ -557,7 +669,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_mandir}/man8/znetconf.8*
|
%{_mandir}/man8/znetconf.8*
|
||||||
%{_mandir}/man8/zpcictl.8*
|
%{_mandir}/man8/zpcictl.8*
|
||||||
%dir %{_datadir}/s390-tools
|
%dir %{_datadir}/s390-tools
|
||||||
%{_datadir}/s390-tools/genprotimg/
|
|
||||||
%{_datadir}/s390-tools/netboot/
|
%{_datadir}/s390-tools/netboot/
|
||||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
|
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
|
||||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
|
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
|
||||||
@ -569,11 +680,25 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
# Additional Fedora/RHEL specific stuff
|
# Additional Fedora/RHEL specific stuff
|
||||||
/boot/tape0
|
/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/genprotimg/
|
||||||
|
|
||||||
#
|
#
|
||||||
# *********************** s390-tools osasnmpd package ***********************
|
# *********************** s390-tools osasnmpd package ***********************
|
||||||
#
|
#
|
||||||
%package osasnmpd
|
%package osasnmpd
|
||||||
Summary: SNMP sub-agent for OSA-Express cards
|
Summary: SNMP sub-agent for OSA-Express cards
|
||||||
|
Provides: s390-tools-osasnmpd = %{epoch}:%{version}-%{release}
|
||||||
Requires: net-snmp
|
Requires: net-snmp
|
||||||
Requires: psmisc
|
Requires: psmisc
|
||||||
BuildRequires: net-snmp-devel
|
BuildRequires: net-snmp-devel
|
||||||
@ -593,6 +718,7 @@ ATM Ethernet LAN Emulation in QDIO mode.
|
|||||||
#
|
#
|
||||||
%package mon_statd
|
%package mon_statd
|
||||||
Summary: Monitoring daemons for Linux in z/VM
|
Summary: Monitoring daemons for Linux in z/VM
|
||||||
|
Provides: s390-tools-mon_statd = %{epoch}:%{version}-%{release}
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
|
||||||
@ -632,6 +758,7 @@ Monitoring daemons for Linux in z/VM:
|
|||||||
#
|
#
|
||||||
%package cpuplugd
|
%package cpuplugd
|
||||||
Summary: Daemon that manages CPU and memory resources
|
Summary: Daemon that manages CPU and memory resources
|
||||||
|
Provides: s390-tools-cpuplugd = %{epoch}:%{version}-%{release}
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
|
|
||||||
@ -661,6 +788,7 @@ memory can be increased or decreased exploiting the CMM1 feature.
|
|||||||
#
|
#
|
||||||
%package ziomon
|
%package ziomon
|
||||||
Summary: S390 ziomon tools
|
Summary: S390 ziomon tools
|
||||||
|
Provides: s390-tools-ziomon = %{epoch}:%{version}-%{release}
|
||||||
Requires: blktrace
|
Requires: blktrace
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
Requires: device-mapper-multipath
|
Requires: device-mapper-multipath
|
||||||
@ -699,6 +827,7 @@ Tool set to collect data for zfcp performance analysis and report.
|
|||||||
#
|
#
|
||||||
%package iucvterm
|
%package iucvterm
|
||||||
Summary: z/VM IUCV terminal applications
|
Summary: z/VM IUCV terminal applications
|
||||||
|
Provides: s390-tools-iucvterm = %{epoch}:%{version}-%{release}
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires(post): grep
|
Requires(post): grep
|
||||||
Requires(postun): grep
|
Requires(postun): grep
|
||||||
@ -763,6 +892,7 @@ fi
|
|||||||
Summary: CMS file system based on FUSE
|
Summary: CMS file system based on FUSE
|
||||||
BuildRequires: fuse3-devel
|
BuildRequires: fuse3-devel
|
||||||
Requires: fuse3
|
Requires: fuse3
|
||||||
|
Provides: s390-tools-cmsfs-fuse = %{epoch}:%{version}-%{release}
|
||||||
Requires: glibc-gconv-extra
|
Requires: glibc-gconv-extra
|
||||||
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
|
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
|
||||||
|
|
||||||
@ -783,6 +913,7 @@ Summary: z/OS data set access based on FUSE
|
|||||||
BuildRequires: fuse3-devel
|
BuildRequires: fuse3-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
Requires: fuse3
|
Requires: fuse3
|
||||||
|
Provides: s390-tools-zdsfs = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description zdsfs
|
%description zdsfs
|
||||||
This package contains the z/OS data set access based on FUSE.
|
This package contains the z/OS data set access based on FUSE.
|
||||||
@ -798,6 +929,7 @@ This package contains the z/OS data set access based on FUSE.
|
|||||||
Summary: HMC drive file system based on FUSE
|
Summary: HMC drive file system based on FUSE
|
||||||
BuildRequires: fuse3-devel
|
BuildRequires: fuse3-devel
|
||||||
Requires: fuse3
|
Requires: fuse3
|
||||||
|
Provides: s390-tools-hmcdrvfs = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description hmcdrvfs
|
%description hmcdrvfs
|
||||||
This package contains a HMC drive file system based on FUSE and a tool
|
This package contains a HMC drive file system based on FUSE and a tool
|
||||||
@ -814,6 +946,7 @@ to list files and directories.
|
|||||||
#
|
#
|
||||||
%package cpacfstatsd
|
%package cpacfstatsd
|
||||||
Summary: Monitor and maintain CPACF activity counters
|
Summary: Monitor and maintain CPACF activity counters
|
||||||
|
Provides: s390-tools-cpacfstatsd = %{epoch}:%{version}-%{release}
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(preun): systemd
|
Requires(preun): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
@ -852,12 +985,13 @@ Summary: Use multipath information for re-IPL path failover
|
|||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: bash
|
BuildRequires: bash
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
%if 0%{?with_pandoc}
|
%if %{with pandoc}
|
||||||
BuildRequires: pandoc
|
BuildRequires: pandoc
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: gawk
|
BuildRequires: gawk
|
||||||
BuildRequires: gzip
|
BuildRequires: gzip
|
||||||
BuildRequires: sed
|
BuildRequires: sed
|
||||||
|
Provides: s390-tools-chreipl-fcp-mpath = %{epoch}:%{version}-%{release}
|
||||||
Requires: bash
|
Requires: bash
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
Requires: util-linux
|
Requires: util-linux
|
||||||
@ -873,7 +1007,7 @@ reconfigures the FCP re-IPL settings to use an operational path.
|
|||||||
|
|
||||||
%files chreipl-fcp-mpath
|
%files chreipl-fcp-mpath
|
||||||
%doc chreipl-fcp-mpath/README.md
|
%doc chreipl-fcp-mpath/README.md
|
||||||
%if 0%{?with_pandoc}
|
%if %{with pandoc}
|
||||||
%doc chreipl-fcp-mpath/README.html
|
%doc chreipl-fcp-mpath/README.html
|
||||||
%endif
|
%endif
|
||||||
%dir %{_prefix}/lib/chreipl-fcp-mpath/
|
%dir %{_prefix}/lib/chreipl-fcp-mpath/
|
||||||
@ -892,7 +1026,7 @@ reconfigures the FCP re-IPL settings to use an operational path.
|
|||||||
#
|
#
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files
|
Summary: Development files
|
||||||
|
Provides: s390-tools-devel = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -905,8 +1039,58 @@ User-space development files for the s390/s390x architecture.
|
|||||||
%{_libdir}/libekmfweb.so
|
%{_libdir}/libekmfweb.so
|
||||||
%{_libdir}/libkmipclient.so
|
%{_libdir}/libkmipclient.so
|
||||||
|
|
||||||
|
#
|
||||||
|
# end of s390x specific sub-packages
|
||||||
|
#
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Mon Oct 23 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2:2.29.0-3
|
||||||
|
- Use vendored dependencies in RHEL builds
|
||||||
|
|
||||||
|
* Thu Aug 31 2023 Jakub Čajka <jcajka[at]redhat.com> - 2:2.29.0-2
|
||||||
|
- enable rust based tools
|
||||||
|
|
||||||
|
* Mon Aug 07 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-1
|
||||||
|
- rebased to 2.29.0
|
||||||
|
|
||||||
|
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.28.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 11 2023 Dan Horák <dan[at]danny.cz> - 2:2.28.0-1
|
||||||
|
- rebased to 2.28.0
|
||||||
|
|
||||||
|
* Wed May 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.27.0-1
|
||||||
|
- rebased to 2.27.0
|
||||||
|
|
||||||
|
* Fri May 19 2023 Petr Pisar <ppisar@redhat.com> - 2:2.26.0-2
|
||||||
|
- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
|
||||||
|
|
||||||
|
* Fri Mar 03 2023 Dan Horák <dan[at]danny.cz> - 2:2.26.0-1
|
||||||
|
- rebased to 2.26.0
|
||||||
|
|
||||||
* Tue Jan 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-4
|
* Tue Jan 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-4
|
||||||
- add post GA fixes
|
- add post GA fixes
|
||||||
|
|
||||||
|
3
sources
3
sources
@ -1 +1,2 @@
|
|||||||
SHA512 (s390-tools-2.25.0.tar.gz) = 1c766a4bd19c957596c741a80141712acf150591c0ff1a47caf1aa8a17f7153c1441560f05aef78bb3f05bd35c1fef431569cabd7e7d6b003bd74beedb7213d9
|
SHA512 (s390-tools-2.31.0.tar.gz) = d05722dff760605baad92b25a7a9264b3c936ff851b87a02ab39604a74d02ae4e14632d9b3d83eb9cb82a14bfcbb0d40bb4797896051ed3dd36d7690abfb1c64
|
||||||
|
SHA512 (s390-tools-2.31.0-rust-vendor.tar.xz) = f9dc2887bb2502ba6f71ef7ea807380c322a46df8c65f0fc7993f3fb4eec4da120369d3e380dbcca9b6250307da0f6236a649504d542f44730e8009ace8ed450
|
||||||
|
Loading…
Reference in New Issue
Block a user