Compare commits
3 Commits
imports/c8
...
c8
Author | SHA1 | Date | |
---|---|---|---|
337d699714 | |||
|
3d70613991 | ||
|
fe420bb181 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
SOURCES/cmsfs-1.1.8c.tar.gz
|
SOURCES/cmsfs-1.1.8c.tar.gz
|
||||||
SOURCES/s390-tools-2.22.0.tar.gz
|
SOURCES/s390-tools-2.29.0-rust-vendor.tar.xz
|
||||||
|
SOURCES/s390-tools-2.29.0.tar.gz
|
||||||
SOURCES/src_vipa-2.1.0.tar.gz
|
SOURCES/src_vipa-2.1.0.tar.gz
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
9c9a4e89bddb2b4e6e09ef6fc7c2e6f2ad6316de SOURCES/cmsfs-1.1.8c.tar.gz
|
|
||||||
7023dd992d5cb418cb522a62c6f8550bf3d4ec37 SOURCES/s390-tools-2.22.0.tar.gz
|
|
||||||
8ed8592a0a9370ce8422df9231ccb17f6cf49bed SOURCES/src_vipa-2.1.0.tar.gz
|
|
@ -1,12 +1,12 @@
|
|||||||
diff -urN cmsfs-1.1.8/cmsfssed.sh cmsfs-1.1.8_/cmsfssed.sh
|
diff -aruN cmsfs-1.1.8c/cmsfssed.sh cmsfs-1.1.8c.alma/cmsfssed.sh
|
||||||
--- cmsfs-1.1.8/cmsfssed.sh 2003-02-28 17:52:59.000000000 -0500
|
--- cmsfs-1.1.8c/cmsfssed.sh 2006-01-29 07:04:32
|
||||||
+++ cmsfs-1.1.8_/cmsfssed.sh 2004-05-28 16:36:22.000000000 -0400
|
+++ cmsfs-1.1.8c.alma/cmsfssed.sh 2023-11-01 10:57:10
|
||||||
@@ -85,7 +85,7 @@
|
@@ -85,7 +85,7 @@
|
||||||
DRIVER_SOURCE="cmsfs22x.c"
|
DRIVER_SOURCE="cmsfs22x.c"
|
||||||
MODULES_DIRECTORY="/lib/modules/`uname -r`/fs"
|
MODULES_DIRECTORY="/lib/modules/`uname -r`/fs"
|
||||||
;;
|
;;
|
||||||
- 2.4*|2.5*)
|
- 2.4*|2.5*)
|
||||||
+ 2.4*|2.5*|2.6*|3.*|4.*)
|
+ 2.4*|2.5*|2.6*|3.*|4.*|5.*)
|
||||||
LINUX_RELEASE="2.4"
|
LINUX_RELEASE="2.4"
|
||||||
# ln -s cmsfs24x.c cmsfsvfs.c
|
# ln -s cmsfs24x.c cmsfsvfs.c
|
||||||
INCLUDES="-I/lib/modules/`uname -r`/build/include"
|
INCLUDES="-I/lib/modules/`uname -r`/build/include"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 14119148dabb7f4f633623c00eece44c5771db10 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.36.1
|
2.39.2
|
||||||
|
|
||||||
|
|
||||||
From 661f143bb0b429c732d0ad9756c745dcb8799bc7 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
|
||||||
@ -208,23 +208,22 @@ Content-Transfer-Encoding: 8bit
|
|||||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
Signed-off-by: Dan Horák <dan@danny.cz>
|
Signed-off-by: Dan Horák <dan@danny.cz>
|
||||||
---
|
---
|
||||||
zipl/src/Makefile | 2 +-
|
zipl/src/Makefile | 1 +
|
||||||
zipl/src/scan.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
|
zipl/src/scan.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
|
||||||
2 files changed, 95 insertions(+), 3 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 786bb7f..1adc486 100644
|
index cab5655..7ec215d 100644
|
||||||
--- a/zipl/src/Makefile
|
--- a/zipl/src/Makefile
|
||||||
+++ b/zipl/src/Makefile
|
+++ b/zipl/src/Makefile
|
||||||
@@ -7,7 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
|
@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
||||||
-D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
|
|
||||||
ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
|
||||||
|
|
||||||
-libs = $(rootdir)/libutil/libutil.a
|
libs = $(rootdir)/libutil/libutil.a \
|
||||||
+libs = $(rootdir)/libutil/libutil.a -lrpm
|
$(rootdir)/libvtoc/libvtoc.a \
|
||||||
|
+ -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
|
||||||
@ -345,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.36.1
|
2.39.2
|
||||||
|
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
From ce0ae3c869dccaff3ed976d58b2d63ce461507e6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Steffen Eiden <seiden@linux.ibm.com>
|
|
||||||
Date: Mon, 25 Jul 2022 12:57:53 +0200
|
|
||||||
Subject: [PATCH] zipl: Add missing check for a nullpointer.
|
|
||||||
|
|
||||||
Fixes a bug that leads to a segmentation fault when no parmline is
|
|
||||||
provided.
|
|
||||||
|
|
||||||
Fixes: 11b401b5 ("zipl: move and make check for maximum command line length dynamic")
|
|
||||||
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
|
|
||||||
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
||||||
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
|
|
||||||
---
|
|
||||||
zipl/src/job.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/zipl/src/job.c b/zipl/src/job.c
|
|
||||||
index ffdc297..b5bf5b2 100644
|
|
||||||
--- a/zipl/src/job.c
|
|
||||||
+++ b/zipl/src/job.c
|
|
||||||
@@ -790,7 +790,7 @@ check_common_ipl_data(struct job_common_ipl_data *common, const char *section,
|
|
||||||
if (!max_parm_size)
|
|
||||||
max_parm_size = LEGACY_MAXIMUM_PARMLINE_SIZE;
|
|
||||||
|
|
||||||
- len = strlen(common->parmline);
|
|
||||||
+ len = common->parmline ? strlen(common->parmline) : 0;
|
|
||||||
if (len > max_parm_size) {
|
|
||||||
error_text("The length of the parameters line "
|
|
||||||
"(%d bytes) exceeds the allowed maximum "
|
|
||||||
--
|
|
||||||
2.37.1
|
|
||||||
|
|
5719
SOURCES/s390utils-2.29.0-rhel.patch
Normal file
5719
SOURCES/s390utils-2.29.0-rhel.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -3,23 +3,32 @@
|
|||||||
|
|
||||||
# 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
|
||||||
|
%bcond_without rust
|
||||||
|
|
||||||
Name: s390utils
|
Name: s390utils
|
||||||
Summary: Utilities and daemons for IBM z Systems
|
Summary: Utilities and daemons for IBM z Systems
|
||||||
Version: 2.22.0
|
Version: 2.29.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
License: MIT
|
License: MIT
|
||||||
ExclusiveArch: s390 s390x
|
|
||||||
#URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
|
#URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
|
||||||
URL: https://github.com/ibm-s390-tools/s390-tools
|
URL: https://github.com/ibm-s390-tools/s390-tools
|
||||||
Source0: https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
Source0: https://github.com/ibm-s390-tools/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
|
||||||
Source4: http://www.linuxvm.org/Patches/S390/cmsfs-%{cmsfsver}.tar.gz
|
Source4: http://www.linuxvm.org/Patches/S390/cmsfs-%{cmsfsver}.tar.gz
|
||||||
Source5: zfcpconf.sh
|
Source5: zfcpconf.sh
|
||||||
# http://www.ibm.com/developerworks/linux/linux390/src_vipa-%%{vipaver}.html
|
# http://www.ibm.com/developerworks/linux/linux390/src_vipa-%%{vipaver}.html
|
||||||
@ -38,7 +47,7 @@ Source24: 20-zipl-kernel.install
|
|||||||
Source25: 52-zipl-rescue.install
|
Source25: 52-zipl-rescue.install
|
||||||
Source26: 91-zipl.install
|
Source26: 91-zipl.install
|
||||||
|
|
||||||
%if 0%{?signzipl}
|
%if %{with signzipl}
|
||||||
%define pesign_name redhatsecureboot302
|
%define pesign_name redhatsecureboot302
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -46,7 +55,7 @@ Source26: 91-zipl.install
|
|||||||
Patch0: s390-tools-zipl-invert-script-options.patch
|
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
|
||||||
|
|
||||||
# backported fixes
|
# upstream fixes/updates
|
||||||
Patch100: s390utils-%{version}-rhel.patch
|
Patch100: s390utils-%{version}-rhel.patch
|
||||||
|
|
||||||
Patch1000: cmsfs-1.1.8-warnings.patch
|
Patch1000: cmsfs-1.1.8-warnings.patch
|
||||||
@ -56,6 +65,13 @@ Patch1003: cmsfs-1.1.8-args.patch
|
|||||||
|
|
||||||
Patch2000: src_vipa-2.1.0-deprecate.patch
|
Patch2000: src_vipa-2.1.0-deprecate.patch
|
||||||
|
|
||||||
|
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||||
|
ExcludeArch: %{ix86}
|
||||||
|
|
||||||
|
%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}
|
||||||
@ -64,8 +80,46 @@ 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}
|
||||||
Requires: s390utils-cmsfs = %{epoch}:%{version}-%{release}
|
Requires: s390utils-cmsfs = %{epoch}:%{version}-%{release}
|
||||||
|
%else
|
||||||
|
#
|
||||||
|
# multiarch package structure
|
||||||
|
#
|
||||||
|
Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
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
|
%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.
|
||||||
@ -82,6 +136,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
|
|||||||
%patch0 -p1 -b .zipl-invert-script-options
|
%patch0 -p1 -b .zipl-invert-script-options
|
||||||
%patch1 -p1 -b .blscfg-rpm-nvr-sort
|
%patch1 -p1 -b .blscfg-rpm-nvr-sort
|
||||||
|
|
||||||
|
# upstream fixes/updates
|
||||||
%patch100 -p1
|
%patch100 -p1
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -112,6 +167,17 @@ popd
|
|||||||
# remove --strip from install
|
# remove --strip from install
|
||||||
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
|
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
|
||||||
|
|
||||||
pushd cmsfs-%{cmsfsver}
|
pushd cmsfs-%{cmsfsver}
|
||||||
# cmdfs: fix encoding
|
# cmdfs: fix encoding
|
||||||
iconv -f ISO8859-1 -t UTF-8 -o README.new README
|
iconv -f ISO8859-1 -t UTF-8 -o README.new README
|
||||||
@ -126,16 +192,22 @@ popd
|
|||||||
%build
|
%build
|
||||||
make \
|
make \
|
||||||
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
||||||
|
%if %{without rust}
|
||||||
|
HAVE_CARGO=0 \
|
||||||
|
%endif
|
||||||
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="" \
|
||||||
BINDIR=/usr/sbin \
|
BINDIR=/usr/sbin \
|
||||||
UDEVRUNDIR=/run/udev \
|
|
||||||
DISTRELEASE=%{release} \
|
DISTRELEASE=%{release} \
|
||||||
V=1
|
V=1
|
||||||
|
|
||||||
|
%ifarch s390x
|
||||||
|
#
|
||||||
|
# s390x/native specific %%build section
|
||||||
|
#
|
||||||
pushd cmsfs-%{cmsfsver}
|
pushd cmsfs-%{cmsfsver}
|
||||||
./configure
|
./configure
|
||||||
make CC="gcc %{build_cflags} -fno-strict-aliasing %{build_ldflags}"
|
make CC="gcc %{build_cflags} -fno-strict-aliasing %{build_ldflags}"
|
||||||
@ -144,23 +216,30 @@ popd
|
|||||||
pushd src_vipa-%{vipaver}
|
pushd src_vipa-%{vipaver}
|
||||||
make CC_FLAGS="%{build_cflags} -fPIC" LD_FLAGS="%{build_ldflags} -shared" LIBDIR=%{_libdir}
|
make CC_FLAGS="%{build_cflags} -fPIC" LD_FLAGS="%{build_ldflags} -shared" LIBDIR=%{_libdir}
|
||||||
popd
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install \
|
make install \
|
||||||
|
%if %{without rust}
|
||||||
|
HAVE_CARGO=0 \
|
||||||
|
%endif
|
||||||
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} \
|
||||||
BINDIR=/usr/sbin \
|
BINDIR=/usr/sbin \
|
||||||
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
||||||
UDEVRUNDIR=/run/udev \
|
|
||||||
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
|
||||||
@ -230,11 +309,63 @@ 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
|
||||||
|
%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 *************************
|
# ************************* s390-tools core package *************************
|
||||||
#
|
#
|
||||||
%package core
|
%package core
|
||||||
@ -290,6 +421,7 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
|
|||||||
%{_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*
|
||||||
@ -344,6 +476,7 @@ 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
|
||||||
@ -351,9 +484,7 @@ 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
|
||||||
BuildRequires: liblockfile-devel
|
|
||||||
|
|
||||||
|
|
||||||
%description base
|
%description base
|
||||||
@ -418,11 +549,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
|
||||||
@ -554,9 +680,14 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_bindir}/dump2tar
|
%{_bindir}/dump2tar
|
||||||
%{_bindir}/genprotimg
|
%{_bindir}/genprotimg
|
||||||
%{_bindir}/mk-s390image
|
%{_bindir}/mk-s390image
|
||||||
|
%if %{with rust}
|
||||||
|
%{_bindir}/pvapconfig
|
||||||
|
%endif
|
||||||
%{_bindir}/pvattest
|
%{_bindir}/pvattest
|
||||||
%{_bindir}/pvextract-hdr
|
%{_bindir}/pvextract-hdr
|
||||||
%{_bindir}/vmconvert
|
%if %{with rust}
|
||||||
|
%{_bindir}/pvsecret
|
||||||
|
%endif
|
||||||
%{_bindir}/zkey
|
%{_bindir}/zkey
|
||||||
%{_bindir}/zkey-cryptsetup
|
%{_bindir}/zkey-cryptsetup
|
||||||
%{_unitdir}/dumpconf.service
|
%{_unitdir}/dumpconf.service
|
||||||
@ -564,6 +695,11 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
|
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
|
||||||
%{_sysconfdir}/mdevctl.d/*
|
%{_sysconfdir}/mdevctl.d/*
|
||||||
/usr/lib/dracut/modules.d/99ngdump/
|
/usr/lib/dracut/modules.d/99ngdump/
|
||||||
|
# own the mdevctl dirs until new release is available
|
||||||
|
%dir /usr/lib/mdevctl
|
||||||
|
%dir /usr/lib/mdevctl/scripts.d
|
||||||
|
%dir /usr/lib/mdevctl/scripts.d/callouts
|
||||||
|
/usr/lib/mdevctl/scripts.d/callouts/ap-check
|
||||||
/lib/s390-tools/dumpconf
|
/lib/s390-tools/dumpconf
|
||||||
/lib/s390-tools/lsznet.raw
|
/lib/s390-tools/lsznet.raw
|
||||||
%dir /lib/s390-tools/zfcpdump
|
%dir /lib/s390-tools/zfcpdump
|
||||||
@ -576,11 +712,23 @@ 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*
|
||||||
|
%if %{with rust}
|
||||||
|
%{_mandir}/man1/pvapconfig.1*
|
||||||
|
%endif
|
||||||
%{_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*
|
%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.1*
|
||||||
%{_mandir}/man1/zkey-cryptsetup.1*
|
%{_mandir}/man1/zkey-cryptsetup.1*
|
||||||
%{_mandir}/man1/zkey-ekmfweb.1*
|
%{_mandir}/man1/zkey-ekmfweb.1*
|
||||||
@ -631,7 +779,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
|
||||||
@ -648,6 +795,18 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_libdir}/src_vipa.so
|
%{_libdir}/src_vipa.so
|
||||||
%{_mandir}/man8/src_vipa.8*
|
%{_mandir}/man8/src_vipa.8*
|
||||||
|
|
||||||
|
%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 ***********************
|
# *********************** s390-tools osasnmpd package ***********************
|
||||||
#
|
#
|
||||||
@ -919,6 +1078,7 @@ Requires(preun): systemd
|
|||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
|
BuildRequires: systemd-devel
|
||||||
|
|
||||||
%description cpacfstatsd
|
%description cpacfstatsd
|
||||||
The cpacfstats tools provide a client/server application set to monitor
|
The cpacfstats tools provide a client/server application set to monitor
|
||||||
@ -951,7 +1111,7 @@ 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
|
||||||
@ -972,7 +1132,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/
|
||||||
@ -1004,8 +1164,66 @@ 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
|
||||||
|
* 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-10568
|
||||||
|
|
||||||
|
* 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-10575)
|
||||||
|
- Resolves: RHEL-10575
|
||||||
|
|
||||||
|
* Mon Dec 04 2023 Dan Horák <dhorak@redhat.com> - 2:2.29.0-1
|
||||||
|
- rebased to 2.29.0 (RHEL-11409)
|
||||||
|
- KVM: Support AP Bindings in SE Header (RHEL-10573)
|
||||||
|
- KVM: Userspace Tool for IBK Request Generation and Insertion (RHEL-10579)
|
||||||
|
- zkey: support for key type PKEY_TYPE_EP11_AES (RHEL-11441)
|
||||||
|
- vmur: fix handling of option -t (RHEL-11479)
|
||||||
|
- dbginfo.sh: global original Input Field Separator (IFS) (RHEL-16526)
|
||||||
|
- enable multi-arch build (RHEL-10568)
|
||||||
|
- Resolves: RHEL-11409 RHEL-10573 RHEL-10579 RHEL-11441 RHEL-11479 RHEL-16526 RHEL-10568
|
||||||
|
|
||||||
|
* Mon Aug 07 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-3
|
||||||
|
- zdev/dracut: fix kdump build to integrate with site support (#2229178)
|
||||||
|
- Resolves: #2229178
|
||||||
|
|
||||||
|
* Fri Jul 21 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-2
|
||||||
|
- Secure Execution APQN binding and IBK association (#2110510)
|
||||||
|
- Resolves: #2110510
|
||||||
|
|
||||||
|
* Tue Jun 06 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-1.1
|
||||||
|
- rebuild
|
||||||
|
- Related: #2159698
|
||||||
|
|
||||||
|
* Mon Jun 05 2023 Dan Horák <dhorak@redhat.com> - 2:2.27.0-1
|
||||||
|
- rebased to 2.27.0 (#2159698)
|
||||||
|
- lszcrypt fails when querying a specific domain (#2177613)
|
||||||
|
- DASD autoquiesce support (#2196510)
|
||||||
|
- zcrypt DD: AP command filtering (#2170362)
|
||||||
|
- vmconvert and zgetdump consolidation (#2173925)
|
||||||
|
- Support for List-Directed dump from ECKD DASD (#2159694)
|
||||||
|
- Support for List-Directed IPL and re-IPL from ECKD DASD (#2159691)
|
||||||
|
- Resolves: #2159698 #2177613 #2196510 #2170362 #2173925 #2159694 #2159691
|
||||||
|
|
||||||
|
* Fri Feb 03 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-2
|
||||||
|
- zkey: Support EP11 host library version 4 (#2165811)
|
||||||
|
- Resolves: #2165811
|
||||||
|
* Tue Dec 13 2022 Dan Horák <dhorak@redhat.com> - 2:2.25.0-1
|
||||||
|
- rebased to 2.25.0 (#2110312)
|
||||||
|
- KVM: Tool to process encrypted Secure Execution guest dumps (#2043851)
|
||||||
|
- zipl: Support for Secure Boot IPL and Dump from ECKD DASD (#2043852)
|
||||||
|
- zdev: Site-aware device configuration (#2043858)
|
||||||
|
- Display Processor Activity Instrumentation CPACF counters (#2111013)
|
||||||
|
- Transparent DASD PPRC (Peer-to-Peer Remote Copy) handling (#2126618)
|
||||||
|
- zipl: Add secure boot trailer (#2142884)
|
||||||
|
- Resolves: #2110312 #2043851 #2043852 #2043858 #2111013 #2126618 #2142884
|
||||||
|
|
||||||
* Fri Aug 05 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-2
|
* Fri Aug 05 2022 Dan Horák <dhorak@redhat.com> - 2:2.22.0-2
|
||||||
- zipl: Add missing check for a nullpointer (#2113976)
|
- zipl: Add missing check for a nullpointer (#2113976)
|
||||||
- Resolves: #2113976
|
- Resolves: #2113976
|
||||||
|
Loading…
Reference in New Issue
Block a user