Compare commits
62 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 | ||
|
9e98b44d8b | ||
|
607a6825f4 | ||
|
685ce32c07 | ||
|
77693cd7eb | ||
|
c33643ba10 | ||
|
bef2b35dc9 | ||
|
af41c81d1b | ||
|
473c14c9ab | ||
|
a7424a8ff0 | ||
|
6f524eab5a | ||
|
ca6b193ac3 | ||
|
cc536faf67 | ||
|
f7710610d8 | ||
|
1c93647293 | ||
|
a2cb8e5beb | ||
|
6dc91fa6ea | ||
|
ad7942bd0c | ||
|
a483890884 | ||
|
78ef6e86e5 | ||
|
b385215ded | ||
|
c69c48c992 | ||
|
ea8f5ea852 | ||
|
083020797b | ||
|
a8e761756e | ||
|
287377b414 | ||
|
c1e8b3a309 | ||
|
0419550a2a | ||
|
9e8e130a7c | ||
|
2a913049ee | ||
|
ce7722eab4 | ||
|
e4da637a53 | ||
|
b2e74b0a3e | ||
|
2bf7d95c95 |
21
.gitignore
vendored
21
.gitignore
vendored
@ -5,22 +5,5 @@ src_vipa-2.0.4.tar.gz
|
|||||||
/lib-zfcp-hbaapi-2.1.tar.gz
|
/lib-zfcp-hbaapi-2.1.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-2.0.0.tar.gz
|
/s390-tools-*.tar.gz
|
||||||
/s390-tools-2.1.0.tar.gz
|
/s390-tools-*-rust-vendor.tar.xz
|
||||||
/s390-tools-2.2.0.tar.gz
|
|
||||||
/s390-tools-2.3.0.tar.gz
|
|
||||||
/s390-tools-2.4.0.tar.gz
|
|
||||||
/s390-tools-2.5.0.tar.gz
|
|
||||||
/s390-tools-2.6.0.tar.gz
|
|
||||||
/s390-tools-2.7.0.tar.gz
|
|
||||||
/s390-tools-2.7.1.tar.gz
|
|
||||||
/s390-tools-2.8.0.tar.gz
|
|
||||||
/s390-tools-2.9.0.tar.gz
|
|
||||||
/s390-tools-2.10.0.tar.gz
|
|
||||||
/s390-tools-2.11.0.tar.gz
|
|
||||||
/s390-tools-2.12.0.tar.gz
|
|
||||||
/s390-tools-2.13.0.tar.gz
|
|
||||||
/s390-tools-2.14.0.tar.gz
|
|
||||||
/s390-tools-2.15.0.tar.gz
|
|
||||||
/s390-tools-2.15.1.tar.gz
|
|
||||||
/s390-tools-2.16.0.tar.gz
|
|
||||||
|
@ -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
|
||||||
@ -88,16 +92,10 @@ case "$COMMAND" in
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
|
||||||
echo "Could not determine the kernel command line parameters." >&2
|
|
||||||
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
[[ -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}"
|
||||||
@ -118,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/")"
|
||||||
|
@ -29,12 +29,6 @@ case "$COMMAND" in
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
|
||||||
echo "Could not determine the kernel command line parameters." >&2
|
|
||||||
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
|
BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
|
||||||
if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
|
if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
|
||||||
sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"
|
sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"
|
||||||
|
13
ccw.udev
13
ccw.udev
@ -1,13 +1,4 @@
|
|||||||
ACTION!="add|change", GOTO="ccw_end"
|
ACTION!="add|bind|change", GOTO="ccw_end"
|
||||||
SUBSYSTEM!="ccw", GOTO="ccw_end"
|
SUBSYSTEM!="ccw", GOTO="ccw_end"
|
||||||
ATTRS{cutype}=="1731/01", RUN+="ccw_init"
|
DRIVER=="ctcm|lcs|qeth", RUN+="ccw_init"
|
||||||
ATTRS{cutype}=="1731/02", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="1731/05", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="1731/06", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="3088/01", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="3088/08", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="3088/60", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="3088/61", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="3088/1e", RUN+="ccw_init"
|
|
||||||
ATTRS{cutype}=="3088/1f", RUN+="ccw_init"
|
|
||||||
LABEL="ccw_end"
|
LABEL="ccw_end"
|
||||||
|
@ -7,7 +7,6 @@ Before=sysinit.target systemd-udev-trigger.service
|
|||||||
Type=oneshot
|
Type=oneshot
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
ExecStart=/usr/sbin/device_cio_free
|
ExecStart=/usr/sbin/device_cio_free
|
||||||
StandardOutput=syslog
|
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=sysinit.target
|
WantedBy=sysinit.target
|
||||||
|
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
|
File diff suppressed because it is too large
Load Diff
@ -1,50 +0,0 @@
|
|||||||
From 3f3f063c98278f53ad3b34e68b70fca62eaea8fb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
||||||
Date: Tue, 23 Feb 2021 08:52:26 +0100
|
|
||||||
Subject: [PATCH] zkey: Fix build error when the compiler flags are overridden
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
When the compiler flags are overridden, the build of zkey may fail with:
|
|
||||||
|
|
||||||
kms.c:44:2: error: #error KMS_PLUGIN_LOCATION must be defined
|
|
||||||
44 | #error KMS_PLUGIN_LOCATION must be defined
|
|
||||||
| ^~~~~
|
|
||||||
|
|
||||||
The Makefile uses CFLAGS variable for defining the KMS_PLUGIN_LOCATION,
|
|
||||||
but it should rather use ALL_CFLAGS.
|
|
||||||
|
|
||||||
Also use ALL_CPPFLAGS for defining HAVE_LUKS2_SUPPORT.
|
|
||||||
|
|
||||||
Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/108
|
|
||||||
|
|
||||||
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
|
|
||||||
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
|
|
||||||
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
|
||||||
---
|
|
||||||
zkey/Makefile | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/zkey/Makefile b/zkey/Makefile
|
|
||||||
index 41129bcf..f74e2091 100644
|
|
||||||
--- a/zkey/Makefile
|
|
||||||
+++ b/zkey/Makefile
|
|
||||||
@@ -18,7 +18,7 @@ ifneq (${HAVE_CRYPTSETUP2},0)
|
|
||||||
ifneq (${HAVE_OPENSSL},0)
|
|
||||||
BUILD_TARGETS += zkey-cryptsetup
|
|
||||||
INSTALL_TARGETS += install-zkey-cryptsetup
|
|
||||||
- CPPFLAGS += -DHAVE_LUKS2_SUPPORT
|
|
||||||
+ ALL_CPPFLAGS += -DHAVE_LUKS2_SUPPORT
|
|
||||||
else
|
|
||||||
BUILD_TARGETS += zkey-cryptsetup-skip-openssl
|
|
||||||
INSTALL_TARGETS += zkey-cryptsetup-skip-openssl
|
|
||||||
@@ -34,7 +34,7 @@ endif
|
|
||||||
|
|
||||||
libs = $(rootdir)/libutil/libutil.a
|
|
||||||
|
|
||||||
-CFLAGS += -DKMS_PLUGIN_LOCATION=\"$(ZKEYKMSPLUGINDIR)\"
|
|
||||||
+ALL_CFLAGS += -DKMS_PLUGIN_LOCATION=\"$(ZKEYKMSPLUGINDIR)\"
|
|
||||||
|
|
||||||
detect-libcryptsetup.dep:
|
|
||||||
echo "#include <libcryptsetup.h>" > detect-libcryptsetup.dep
|
|
@ -1,19 +1,234 @@
|
|||||||
diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/Makefile
|
From b2daaa34776ba6afec879e362378f6f7563590a6 Mon Sep 17 00:00:00 2001
|
||||||
--- s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort 2019-05-22 08:16:17.317273801 -0400
|
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||||
+++ s390-tools-2.9.0/zipl/src/Makefile 2019-05-22 08:18:02.947273801 -0400
|
Date: Mon, 20 Jun 2022 17:43:05 +0200
|
||||||
@@ -7,7 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
|
Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
|
||||||
-D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
|
versions"
|
||||||
ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
|
||||||
|
This reverts commit a0dba6bfdb50ff373fa710ffe2a307cc0748f18b.
|
||||||
|
---
|
||||||
|
zipl/src/scan.c | 139 ++----------------------------------------------
|
||||||
|
1 file changed, 3 insertions(+), 136 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||||
|
index 0cea1d4..9352f76 100644
|
||||||
|
--- a/zipl/src/scan.c
|
||||||
|
+++ b/zipl/src/scan.c
|
||||||
|
@@ -10,7 +10,6 @@
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
-libs = $(rootdir)/libutil/libutil.a
|
-static const char *VERSION_KEYWORD = "version";
|
||||||
+libs = $(rootdir)/libutil/libutil.a -lrpmio -lrpm
|
|
||||||
|
|
||||||
objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
|
/* Need ISOC99 function isblank() in ctype.h */
|
||||||
install.o zipl.o $(rootdir)/zipl/boot/data.o
|
#ifndef __USE_ISOC99
|
||||||
diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/scan.c
|
@@ -646,7 +645,7 @@ scan_file(const char* filename, struct scan_token** token)
|
||||||
--- s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort 2019-05-21 09:13:36.000000000 -0400
|
|
||||||
+++ s390-tools-2.9.0/zipl/src/scan.c 2019-05-22 08:16:17.317273801 -0400
|
|
||||||
@@ -33,6 +33,8 @@
|
static int
|
||||||
|
-bls_filter_by_names(const struct dirent *ent)
|
||||||
|
+bls_filter(const struct dirent *ent)
|
||||||
|
{
|
||||||
|
int offset = strlen(ent->d_name) - strlen(".conf");
|
||||||
|
|
||||||
|
@@ -656,111 +655,13 @@ bls_filter_by_names(const struct dirent *ent)
|
||||||
|
return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-struct version {
|
||||||
|
- char *line; /* pointer to a line with version keyword */
|
||||||
|
- int offset; /* offset of version value in the line */
|
||||||
|
-};
|
||||||
|
-
|
||||||
|
-/*
|
||||||
|
- * Locate version in bls file represented by ENT
|
||||||
|
- */
|
||||||
|
-static void get_version(const struct dirent *ent, struct version *v)
|
||||||
|
-{
|
||||||
|
- char *line = NULL;
|
||||||
|
- size_t len = 0;
|
||||||
|
- char *d_name;
|
||||||
|
- FILE *stream;
|
||||||
|
- ssize_t read;
|
||||||
|
-
|
||||||
|
- memset(v, 0, sizeof(*v));
|
||||||
|
- d_name = misc_make_path((char *)blsdir, (char *)ent->d_name);
|
||||||
|
- if (!d_name)
|
||||||
|
- return;
|
||||||
|
-
|
||||||
|
- stream = fopen(d_name, "r");
|
||||||
|
- free(d_name);
|
||||||
|
- if (!stream)
|
||||||
|
- return;
|
||||||
|
-
|
||||||
|
- while ((read = getline(&line, &len, stream)) != -1) {
|
||||||
|
- if (line[read - 1] == '\n') {
|
||||||
|
- line[read - 1] = '\0';
|
||||||
|
- read--;
|
||||||
|
- }
|
||||||
|
- if ((size_t)read <= strlen(VERSION_KEYWORD) + 1)
|
||||||
|
- continue;
|
||||||
|
- if (strcmp(VERSION_KEYWORD, line) > 0)
|
||||||
|
- continue;
|
||||||
|
- if (!isblank(line[strlen(VERSION_KEYWORD)]))
|
||||||
|
- continue;
|
||||||
|
- /* skip blanks */
|
||||||
|
- v->offset = strlen(VERSION_KEYWORD) + 1;
|
||||||
|
- while (v->offset < read - 1 && isblank(line[v->offset]))
|
||||||
|
- v->offset++;
|
||||||
|
- if (isblank(line[v->offset]))
|
||||||
|
- /*
|
||||||
|
- * all characters after the keyword
|
||||||
|
- * are blanks. Invalid version
|
||||||
|
- */
|
||||||
|
- continue;
|
||||||
|
- v->line = line;
|
||||||
|
- fclose(stream);
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
- free(line);
|
||||||
|
- fclose(stream);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-static void put_version(struct version *v)
|
||||||
|
-{
|
||||||
|
- free(v->line);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-/**
|
||||||
|
- * Check version in bls file represented by ENT.
|
||||||
|
- * Return 1 if version is valid. Otherwise return 0
|
||||||
|
- */
|
||||||
|
-static int bls_filter_by_versions(const struct dirent *ent)
|
||||||
|
-{
|
||||||
|
- struct version v;
|
||||||
|
-
|
||||||
|
- if (bls_filter_by_names(ent) == 0)
|
||||||
|
- return 0;
|
||||||
|
-
|
||||||
|
- get_version(ent, &v);
|
||||||
|
- if (v.line) {
|
||||||
|
- put_version(&v);
|
||||||
|
- return 1;
|
||||||
|
- }
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
|
||||||
|
static int
|
||||||
|
-bls_sort_by_names(const struct dirent **ent_a, const struct dirent **ent_b)
|
||||||
|
+bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
|
||||||
|
{
|
||||||
|
return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int
|
||||||
|
-bls_sort_by_versions(const struct dirent **ent_a, const struct dirent **ent_b)
|
||||||
|
-{
|
||||||
|
- struct version v1, v2;
|
||||||
|
- int ret;
|
||||||
|
-
|
||||||
|
- get_version(*ent_a, &v1);
|
||||||
|
- get_version(*ent_b, &v2);
|
||||||
|
- /*
|
||||||
|
- * Both versions are valid.
|
||||||
|
- * It is guaranteed by bls_filter_by_versions()
|
||||||
|
- */
|
||||||
|
- ret = strverscmp(v1.line + v1.offset, v2.line + v2.offset);
|
||||||
|
-
|
||||||
|
- put_version(&v1);
|
||||||
|
- put_version(&v2);
|
||||||
|
-
|
||||||
|
- return ret;
|
||||||
|
-}
|
||||||
|
|
||||||
|
static int
|
||||||
|
scan_append_section_heading(struct scan_token* scan, int* index, char* name);
|
||||||
|
@@ -1110,40 +1011,6 @@ scan_count_target_keywords(char* keyword[])
|
||||||
|
return num;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static int bls_scandir(struct dirent ***bls_entries)
|
||||||
|
-{
|
||||||
|
- struct dirent **entries1;
|
||||||
|
- struct dirent **entries2;
|
||||||
|
- int n1, n2;
|
||||||
|
-
|
||||||
|
- /* arrange by names */
|
||||||
|
- n1 = scandir(blsdir, &entries1,
|
||||||
|
- bls_filter_by_names, bls_sort_by_names);
|
||||||
|
- if (n1 <= 0)
|
||||||
|
- return n1;
|
||||||
|
- /* arrange by versions */
|
||||||
|
- n2 = scandir(blsdir, &entries2,
|
||||||
|
- bls_filter_by_versions, bls_sort_by_versions);
|
||||||
|
-
|
||||||
|
- if (n2 <= 0 || n2 < n1) {
|
||||||
|
- /*
|
||||||
|
- * failed to sort by versions,
|
||||||
|
- * fall back to sorting by filenames
|
||||||
|
- */
|
||||||
|
- *bls_entries = entries1;
|
||||||
|
- while (n2--)
|
||||||
|
- free(entries2[n2]);
|
||||||
|
- free(entries2);
|
||||||
|
- return n1;
|
||||||
|
- }
|
||||||
|
- /* use arrangement by versions */
|
||||||
|
- *bls_entries = entries2;
|
||||||
|
- while (n1--)
|
||||||
|
- free(entries1[n1]);
|
||||||
|
- free(entries1);
|
||||||
|
- return n2;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
int
|
||||||
|
scan_check_target_data(char* keyword[], int* line)
|
||||||
|
{
|
||||||
|
@@ -1464,7 +1331,7 @@ int scan_bls(struct scan_token **token, int scan_size)
|
||||||
|
if (!(stat(blsdir, &sb) == 0 && S_ISDIR(sb.st_mode)))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
- n = bls_scandir(&bls_entries);
|
||||||
|
+ n = scandir(blsdir, &bls_entries, bls_filter, bls_sort);
|
||||||
|
if (n <= 0)
|
||||||
|
return n;
|
||||||
|
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
||||||
|
|
||||||
|
From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 20 Jun 2022 17:46:59 +0200
|
||||||
|
Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
Signed-off-by: Dan Horák <dan@danny.cz>
|
||||||
|
---
|
||||||
|
zipl/src/Makefile | 1 +
|
||||||
|
zipl/src/scan.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
|
||||||
|
2 files changed, 95 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/Makefile b/zipl/src/Makefile
|
||||||
|
index cab5655..7ec215d 100644
|
||||||
|
--- a/zipl/src/Makefile
|
||||||
|
+++ b/zipl/src/Makefile
|
||||||
|
@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
||||||
|
|
||||||
|
libs = $(rootdir)/libutil/libutil.a \
|
||||||
|
$(rootdir)/libvtoc/libvtoc.a \
|
||||||
|
+ -lrpmio -lrpm
|
||||||
|
|
||||||
|
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
|
||||||
|
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||||
|
index 9352f76..3327e2d 100644
|
||||||
|
--- a/zipl/src/scan.c
|
||||||
|
+++ b/zipl/src/scan.c
|
||||||
|
@@ -35,6 +35,8 @@
|
||||||
|
|
||||||
#include "lib/util_base.h"
|
#include "lib/util_base.h"
|
||||||
|
|
||||||
@ -22,7 +237,7 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
|
|||||||
#include "boot.h"
|
#include "boot.h"
|
||||||
#include "error.h"
|
#include "error.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
@@ -653,13 +655,103 @@ bls_filter(const struct dirent *ent)
|
@@ -655,13 +657,103 @@ bls_filter(const struct dirent *ent)
|
||||||
return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
|
return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,3 +343,6 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
|
|||||||
|
|
||||||
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.39.2
|
||||||
|
|
||||||
|
@ -61,10 +61,10 @@ index 871935c783f..d8d5eca5867 100755
|
|||||||
;;
|
;;
|
||||||
--)
|
--)
|
||||||
shift
|
shift
|
||||||
diff --git a/scripts/zipl-switch-to-blscfg.1 b/scripts/zipl-switch-to-blscfg.1
|
diff --git a/scripts/zipl-switch-to-blscfg.8 b/scripts/zipl-switch-to-blscfg.8
|
||||||
index 6bd14d00d14..71b904ffd1c 100644
|
index 6bd14d00d14..71b904ffd1c 100644
|
||||||
--- a/scripts/zipl-switch-to-blscfg.1
|
--- a/scripts/zipl-switch-to-blscfg.8
|
||||||
+++ b/scripts/zipl-switch-to-blscfg.1
|
+++ b/scripts/zipl-switch-to-blscfg.8
|
||||||
@@ -37,9 +37,9 @@ The DIRECTORY where the BLS fragments will be generated. The directory is create
|
@@ -37,9 +37,9 @@ The DIRECTORY where the BLS fragments will be generated. The directory is create
|
||||||
The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
|
The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
|
||||||
|
|
||||||
|
0
s390utils-2.31.0-fedora.patch
Normal file
0
s390utils-2.31.0-fedora.patch
Normal file
471
s390utils.spec
471
s390utils.spec
@ -1,33 +1,44 @@
|
|||||||
# 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
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%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.16.0
|
Version: 2.31.0
|
||||||
Release: 2%{?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: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
|
URL: https://github.com/ibm-s390-linux/s390-tools
|
||||||
URL: https://github.com/ibm-s390-tools/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-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
# To create the vendor tarball:
|
||||||
Source5: zfcpconf.sh
|
# tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust ; \
|
||||||
Source7: zfcp.udev
|
# rm -f Cargo.lock && cargo vendor && \
|
||||||
# files for DASD initialization
|
# tar Jvcf ../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
|
||||||
Source12: dasd.udev
|
Source1: s390-tools-%{version}-rust-vendor.tar.xz
|
||||||
Source13: dasdconf.sh
|
Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh
|
||||||
Source14: device_cio_free
|
Source7: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev
|
||||||
Source15: device_cio_free.service
|
Source12: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev
|
||||||
Source16: ccw_init
|
Source13: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasdconf.sh
|
||||||
Source17: ccw.udev
|
Source14: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/device_cio_free
|
||||||
Source21: normalize_dasd_arg
|
Source15: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/device_cio_free.service
|
||||||
|
Source16: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/ccw_init
|
||||||
|
Source17: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/ccw.udev
|
||||||
|
Source21: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/normalize_dasd_arg
|
||||||
Source23: 20-zipl-kernel.install
|
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
|
||||||
|
|
||||||
@ -35,12 +46,19 @@ Source25: 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
|
||||||
|
|
||||||
# upstream fixes
|
# upstream fixes/updates
|
||||||
# https://github.com/ibm-s390-linux/s390-tools/commit/3f3f063c98278f53ad3b34e68b70fca62eaea8fb
|
#Patch100: s390utils-%%{version}-fedora.patch
|
||||||
Patch100: s390-tools-2.16.0-zkey.patch
|
|
||||||
# https://github.com/ibm-s390-linux/s390-tools/commit/b6bdd7744aba06d82f30b0c84012f0b06ccb01de
|
|
||||||
Patch101: s390-tools-2.16.0-genprotimg.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}
|
||||||
@ -48,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.
|
||||||
@ -61,23 +118,25 @@ 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
|
|
||||||
%patch100 -p1
|
|
||||||
%patch101 -p1
|
|
||||||
|
|
||||||
# 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_cflags}" LDFLAGS="%{build_ldflags}" \
|
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
||||||
|
HAVE_DRACUT=1 \
|
||||||
|
%if %{with pandoc}
|
||||||
|
ENABLE_DOC=1 \
|
||||||
|
%endif
|
||||||
|
NO_PIE_LDFLAGS="" \
|
||||||
BINDIR=/usr/sbin \
|
BINDIR=/usr/sbin \
|
||||||
DISTRELEASE=%{release} \
|
DISTRELEASE=%{release} \
|
||||||
V=1
|
V=1
|
||||||
@ -86,14 +145,21 @@ make \
|
|||||||
%install
|
%install
|
||||||
make install \
|
make install \
|
||||||
HAVE_DRACUT=1 \
|
HAVE_DRACUT=1 \
|
||||||
|
%if %{with pandoc}
|
||||||
|
ENABLE_DOC=1 \
|
||||||
|
%endif
|
||||||
DESTDIR=%{buildroot} \
|
DESTDIR=%{buildroot} \
|
||||||
BINDIR=/usr/sbin \
|
BINDIR=/usr/sbin \
|
||||||
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
||||||
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
|
||||||
@ -151,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
|
||||||
@ -183,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
|
||||||
@ -191,17 +301,25 @@ This package provides minimal set of tools needed to system to boot.
|
|||||||
%{_sbindir}/dasdinfo
|
%{_sbindir}/dasdinfo
|
||||||
%{_sbindir}/fdasd
|
%{_sbindir}/fdasd
|
||||||
%{_sbindir}/lszdev
|
%{_sbindir}/lszdev
|
||||||
|
%{_sbindir}/vmcp
|
||||||
%{_sbindir}/zipl
|
%{_sbindir}/zipl
|
||||||
%dir /lib/s390-tools/
|
%{_sbindir}/zipl-editenv
|
||||||
|
%dir /lib/s390-tools
|
||||||
/lib/s390-tools/{zipl,chreipl}_helper.*
|
/lib/s390-tools/{zipl,chreipl}_helper.*
|
||||||
/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-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
|
||||||
%{_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*
|
||||||
@ -210,7 +328,9 @@ This package provides minimal set of tools needed to system to boot.
|
|||||||
%{_mandir}/man8/dasdinfo.8*
|
%{_mandir}/man8/dasdinfo.8*
|
||||||
%{_mandir}/man8/fdasd.8*
|
%{_mandir}/man8/fdasd.8*
|
||||||
%{_mandir}/man8/lszdev.8*
|
%{_mandir}/man8/lszdev.8*
|
||||||
|
%{_mandir}/man8/vmcp.8*
|
||||||
%{_mandir}/man8/zipl.8*
|
%{_mandir}/man8/zipl.8*
|
||||||
|
%{_mandir}/man8/zipl-editenv.8*
|
||||||
|
|
||||||
# Additional Fedora/RHEL specific stuff
|
# Additional Fedora/RHEL specific stuff
|
||||||
%ghost %config(noreplace) %{_sysconfdir}/dasd.conf
|
%ghost %config(noreplace) %{_sysconfdir}/dasd.conf
|
||||||
@ -230,6 +350,7 @@ This package provides minimal set of tools needed to system to boot.
|
|||||||
%{_udevrulesdir}/59-dasd.rules
|
%{_udevrulesdir}/59-dasd.rules
|
||||||
%{_udevrulesdir}/60-readahead.rules
|
%{_udevrulesdir}/60-readahead.rules
|
||||||
%{_udevrulesdir}/81-ccw.rules
|
%{_udevrulesdir}/81-ccw.rules
|
||||||
|
%{_udevrulesdir}/81-dpm.rules
|
||||||
%{_udevrulesdir}/90-cpi.rules
|
%{_udevrulesdir}/90-cpi.rules
|
||||||
%{_sysconfdir}/kernel/install.d/20-grubby.install
|
%{_sysconfdir}/kernel/install.d/20-grubby.install
|
||||||
%{_prefix}/lib/kernel/install.d/10-zfcpdump.install
|
%{_prefix}/lib/kernel/install.d/10-zfcpdump.install
|
||||||
@ -243,13 +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: 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
|
||||||
@ -257,7 +381,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
|
||||||
|
|
||||||
|
|
||||||
%description base
|
%description base
|
||||||
@ -322,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
|
||||||
@ -417,6 +536,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_sbindir}/dasdstat
|
%{_sbindir}/dasdstat
|
||||||
%{_sbindir}/dasdview
|
%{_sbindir}/dasdview
|
||||||
%{_sbindir}/dbginfo.sh
|
%{_sbindir}/dbginfo.sh
|
||||||
|
%{_sbindir}/hsavmcore
|
||||||
%{_sbindir}/hsci
|
%{_sbindir}/hsci
|
||||||
%{_sbindir}/hyptop
|
%{_sbindir}/hyptop
|
||||||
%{_sbindir}/ip_watcher.pl
|
%{_sbindir}/ip_watcher.pl
|
||||||
@ -424,8 +544,10 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_sbindir}/lscpumf
|
%{_sbindir}/lscpumf
|
||||||
%{_sbindir}/lscss
|
%{_sbindir}/lscss
|
||||||
%{_sbindir}/lsdasd
|
%{_sbindir}/lsdasd
|
||||||
%{_sbindir}/lsqeth
|
%{_sbindir}/lshwc
|
||||||
%{_sbindir}/lsluns
|
%{_sbindir}/lsluns
|
||||||
|
%{_sbindir}/lsqeth
|
||||||
|
%{_sbindir}/lspai
|
||||||
%{_sbindir}/lsreipl
|
%{_sbindir}/lsreipl
|
||||||
%{_sbindir}/lsscm
|
%{_sbindir}/lsscm
|
||||||
%{_sbindir}/lsshut
|
%{_sbindir}/lsshut
|
||||||
@ -433,16 +555,17 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_sbindir}/lstape
|
%{_sbindir}/lstape
|
||||||
%{_sbindir}/lszcrypt
|
%{_sbindir}/lszcrypt
|
||||||
%{_sbindir}/lszfcp
|
%{_sbindir}/lszfcp
|
||||||
|
%{_sbindir}/pai
|
||||||
%{_sbindir}/qetharp
|
%{_sbindir}/qetharp
|
||||||
%{_sbindir}/qethconf
|
%{_sbindir}/qethconf
|
||||||
%{_sbindir}/qethqoat
|
%{_sbindir}/qethqoat
|
||||||
%{_sbindir}/scsi_logging_level
|
%{_sbindir}/scsi_logging_level
|
||||||
|
%{_sbindir}/sclpdbf
|
||||||
%{_sbindir}/start_hsnc.sh
|
%{_sbindir}/start_hsnc.sh
|
||||||
%{_sbindir}/tape390_crypt
|
%{_sbindir}/tape390_crypt
|
||||||
%{_sbindir}/tape390_display
|
%{_sbindir}/tape390_display
|
||||||
%{_sbindir}/ttyrun
|
%{_sbindir}/ttyrun
|
||||||
%{_sbindir}/tunedasd
|
%{_sbindir}/tunedasd
|
||||||
%{_sbindir}/vmcp
|
|
||||||
%{_sbindir}/vmur
|
%{_sbindir}/vmur
|
||||||
%{_sbindir}/xcec-bridge
|
%{_sbindir}/xcec-bridge
|
||||||
%{_sbindir}/zcryptctl
|
%{_sbindir}/zcryptctl
|
||||||
@ -454,30 +577,54 @@ 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}/vmconvert
|
%{_bindir}/pvattest
|
||||||
|
%{_bindir}/pvextract-hdr
|
||||||
|
%{_bindir}/pvsecret
|
||||||
%{_bindir}/zkey
|
%{_bindir}/zkey
|
||||||
%{_bindir}/zkey-cryptsetup
|
%{_bindir}/zkey-cryptsetup
|
||||||
%{_unitdir}/dumpconf.service
|
%{_unitdir}/dumpconf.service
|
||||||
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
|
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
|
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
|
||||||
|
%{_sysconfdir}/mdevctl.d/*
|
||||||
|
/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
|
||||||
/lib/s390-tools/zfcpdump/zfcpdump-initrd
|
/lib/s390-tools/zfcpdump/zfcpdump-initrd
|
||||||
/lib/s390-tools/znetcontrolunits
|
/lib/s390-tools/znetcontrolunits
|
||||||
%{_libdir}/libekmfweb.so.*
|
%{_libdir}/libekmfweb.so.*
|
||||||
|
%{_libdir}/libkmipclient.so.*
|
||||||
|
%dir %{_libdir}/zkey
|
||||||
%{_libdir}/zkey/zkey-ekmfweb.so
|
%{_libdir}/zkey/zkey-ekmfweb.so
|
||||||
%{_mandir}/man1/dbginfo.sh.1*
|
%{_libdir}/zkey/zkey-kmip.so
|
||||||
%{_mandir}/man1/dump2tar.1*
|
%{_mandir}/man1/dump2tar.1*
|
||||||
%{_mandir}/man1/lscpumf.1*
|
%{_mandir}/man1/genprotimg.1*
|
||||||
%{_mandir}/man1/vmconvert.1*
|
%{_mandir}/man1/pvapconfig.1*
|
||||||
%{_mandir}/man1/zfcpdbf.1*
|
%{_mandir}/man1/pvattest.1*
|
||||||
%{_mandir}/man1/zipl-switch-to-blscfg.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*
|
||||||
%{_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*
|
||||||
|
%{_mandir}/man1/zkey-kmip.1*
|
||||||
%{_mandir}/man4/prandom.4*
|
%{_mandir}/man4/prandom.4*
|
||||||
|
%{_mandir}/man5/hsavmcore.conf.5*
|
||||||
%{_mandir}/man8/chccwdev.8*
|
%{_mandir}/man8/chccwdev.8*
|
||||||
%{_mandir}/man8/chchp.8*
|
%{_mandir}/man8/chchp.8*
|
||||||
%{_mandir}/man8/chcpumf.8*
|
%{_mandir}/man8/chcpumf.8*
|
||||||
@ -485,14 +632,18 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_mandir}/man8/chzcrypt.8*
|
%{_mandir}/man8/chzcrypt.8*
|
||||||
%{_mandir}/man8/dasdstat.8*
|
%{_mandir}/man8/dasdstat.8*
|
||||||
%{_mandir}/man8/dasdview.8*
|
%{_mandir}/man8/dasdview.8*
|
||||||
|
%{_mandir}/man8/dbginfo.sh.8*
|
||||||
%{_mandir}/man8/dumpconf.8*
|
%{_mandir}/man8/dumpconf.8*
|
||||||
%{_mandir}/man8/genprotimg.8.*
|
%{_mandir}/man8/hsavmcore.8*
|
||||||
%{_mandir}/man8/hsci.8*
|
%{_mandir}/man8/hsci.8*
|
||||||
%{_mandir}/man8/hyptop.8*
|
%{_mandir}/man8/hyptop.8*
|
||||||
%{_mandir}/man8/lschp.8*
|
%{_mandir}/man8/lschp.8*
|
||||||
|
%{_mandir}/man8/lscpumf.8*
|
||||||
%{_mandir}/man8/lscss.8*
|
%{_mandir}/man8/lscss.8*
|
||||||
%{_mandir}/man8/lsdasd.8*
|
%{_mandir}/man8/lsdasd.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*
|
||||||
@ -501,6 +652,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_mandir}/man8/lstape.8*
|
%{_mandir}/man8/lstape.8*
|
||||||
%{_mandir}/man8/lszcrypt.8*
|
%{_mandir}/man8/lszcrypt.8*
|
||||||
%{_mandir}/man8/lszfcp.8*
|
%{_mandir}/man8/lszfcp.8*
|
||||||
|
%{_mandir}/man8/pai.8*
|
||||||
%{_mandir}/man8/qetharp.8*
|
%{_mandir}/man8/qetharp.8*
|
||||||
%{_mandir}/man8/qethconf.8*
|
%{_mandir}/man8/qethconf.8*
|
||||||
%{_mandir}/man8/qethqoat.8*
|
%{_mandir}/man8/qethqoat.8*
|
||||||
@ -508,28 +660,45 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||||||
%{_mandir}/man8/tape390_display.8*
|
%{_mandir}/man8/tape390_display.8*
|
||||||
%{_mandir}/man8/ttyrun.8*
|
%{_mandir}/man8/ttyrun.8*
|
||||||
%{_mandir}/man8/tunedasd.8*
|
%{_mandir}/man8/tunedasd.8*
|
||||||
%{_mandir}/man8/vmcp.8*
|
|
||||||
%{_mandir}/man8/vmur.8*
|
%{_mandir}/man8/vmur.8*
|
||||||
%{_mandir}/man8/zcryptctl.8*
|
%{_mandir}/man8/zcryptctl.8*
|
||||||
%{_mandir}/man8/zcryptstats.8*
|
%{_mandir}/man8/zcryptstats.8*
|
||||||
|
%{_mandir}/man8/zfcpdbf.8*
|
||||||
%{_mandir}/man8/zgetdump.8*
|
%{_mandir}/man8/zgetdump.8*
|
||||||
|
%{_mandir}/man8/zipl-switch-to-blscfg.8*
|
||||||
%{_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/profiles
|
||||||
|
%config(noreplace) %attr(0660,root,zkeyadm)%{_sysconfdir}/zkey/kmip/profiles/*.profile
|
||||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/repository
|
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/repository
|
||||||
%config(noreplace) %attr(0660,root,zkeyadm)%{_sysconfdir}/zkey/kms-plugins.conf
|
%config(noreplace) %attr(0660,root,zkeyadm)%{_sysconfdir}/zkey/kms-plugins.conf
|
||||||
|
|
||||||
# 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
|
||||||
@ -549,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}
|
||||||
|
|
||||||
@ -588,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
|
||||||
|
|
||||||
@ -617,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
|
||||||
@ -655,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
|
||||||
@ -717,8 +890,10 @@ fi
|
|||||||
#
|
#
|
||||||
%package cmsfs-fuse
|
%package cmsfs-fuse
|
||||||
Summary: CMS file system based on FUSE
|
Summary: CMS file system based on FUSE
|
||||||
BuildRequires: fuse-devel
|
BuildRequires: fuse3-devel
|
||||||
Requires: fuse
|
Requires: fuse3
|
||||||
|
Provides: s390-tools-cmsfs-fuse = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: glibc-gconv-extra
|
||||||
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
|
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
|
||||||
|
|
||||||
%description cmsfs-fuse
|
%description cmsfs-fuse
|
||||||
@ -735,9 +910,10 @@ This package contains the CMS file system based on FUSE.
|
|||||||
#
|
#
|
||||||
%package zdsfs
|
%package zdsfs
|
||||||
Summary: z/OS data set access based on FUSE
|
Summary: z/OS data set access based on FUSE
|
||||||
BuildRequires: fuse-devel
|
BuildRequires: fuse3-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
Requires: fuse
|
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.
|
||||||
@ -751,8 +927,9 @@ This package contains the z/OS data set access based on FUSE.
|
|||||||
#
|
#
|
||||||
%package hmcdrvfs
|
%package hmcdrvfs
|
||||||
Summary: HMC drive file system based on FUSE
|
Summary: HMC drive file system based on FUSE
|
||||||
BuildRequires: fuse-devel
|
BuildRequires: fuse3-devel
|
||||||
Requires: fuse
|
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
|
||||||
@ -769,11 +946,13 @@ 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
|
||||||
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
|
||||||
@ -798,12 +977,56 @@ getent group cpacfstats >/dev/null || groupadd -r cpacfstats
|
|||||||
%{_mandir}/man8/cpacfstatsd.8*
|
%{_mandir}/man8/cpacfstatsd.8*
|
||||||
%{_unitdir}/cpacfstatsd.service
|
%{_unitdir}/cpacfstatsd.service
|
||||||
|
|
||||||
|
#
|
||||||
|
# *********************** chreipl-fcp-mpath package ***********************
|
||||||
|
#
|
||||||
|
%package chreipl-fcp-mpath
|
||||||
|
Summary: Use multipath information for re-IPL path failover
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: bash
|
||||||
|
BuildRequires: coreutils
|
||||||
|
%if %{with pandoc}
|
||||||
|
BuildRequires: pandoc
|
||||||
|
%endif
|
||||||
|
BuildRequires: gawk
|
||||||
|
BuildRequires: gzip
|
||||||
|
BuildRequires: sed
|
||||||
|
Provides: s390-tools-chreipl-fcp-mpath = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: bash
|
||||||
|
Requires: coreutils
|
||||||
|
Requires: util-linux
|
||||||
|
Requires: systemd-udev
|
||||||
|
Requires: device-mapper-multipath
|
||||||
|
Requires: dracut
|
||||||
|
|
||||||
|
%description chreipl-fcp-mpath
|
||||||
|
The chreipl-fcp-mpath toolset monitors udev events about paths to the re-IPL
|
||||||
|
volume. If the currently configured FCP re-IPL path becomes unavailable, the
|
||||||
|
toolset checks for operational paths to the same volume. If available, it
|
||||||
|
reconfigures the FCP re-IPL settings to use an operational path.
|
||||||
|
|
||||||
|
%files chreipl-fcp-mpath
|
||||||
|
%doc chreipl-fcp-mpath/README.md
|
||||||
|
%if %{with pandoc}
|
||||||
|
%doc chreipl-fcp-mpath/README.html
|
||||||
|
%endif
|
||||||
|
%dir %{_prefix}/lib/chreipl-fcp-mpath/
|
||||||
|
%{_prefix}/lib/chreipl-fcp-mpath/*
|
||||||
|
%{_prefix}/lib/dracut/dracut.conf.d/70-chreipl-fcp-mpath.conf
|
||||||
|
%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-tgt
|
||||||
|
%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-vol
|
||||||
|
%{_prefix}/lib/udev/chreipl-fcp-mpath-is-reipl-zfcp
|
||||||
|
%{_prefix}/lib/udev/chreipl-fcp-mpath-record-volume-identifier
|
||||||
|
%{_prefix}/lib/udev/chreipl-fcp-mpath-try-change-ipl-path
|
||||||
|
%{_udevrulesdir}/70-chreipl-fcp-mpath.rules
|
||||||
|
%{_mandir}/man7/chreipl-fcp-mpath.7*
|
||||||
|
|
||||||
#
|
#
|
||||||
# *********************** devel package ***********************
|
# *********************** devel package ***********************
|
||||||
#
|
#
|
||||||
%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
|
||||||
@ -812,10 +1035,124 @@ User-space development files for the s390/s390x architecture.
|
|||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/%{name}/
|
%{_includedir}/%{name}/
|
||||||
%{_includedir}/ekmfweb/
|
%{_includedir}/ekmfweb/
|
||||||
|
%{_includedir}/kmipclient/
|
||||||
%{_libdir}/libekmfweb.so
|
%{_libdir}/libekmfweb.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
|
||||||
|
- add post GA fixes
|
||||||
|
|
||||||
|
* Mon Jan 23 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-3
|
||||||
|
- revert the kernel install script change
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-2
|
||||||
|
- update kernel install script to write /etc/kernel/cmdline
|
||||||
|
|
||||||
|
* Fri Dec 09 2022 Dan Horák <dan[at]danny.cz> - 2:2.25.0-1
|
||||||
|
- rebased to 2.25.0
|
||||||
|
|
||||||
|
* Tue Nov 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-2
|
||||||
|
- update for Transparent DASD PPRC (Peer-to-Peer Remote Copy) handling
|
||||||
|
|
||||||
|
* Thu Nov 10 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-1
|
||||||
|
- rebased to 2.24.0
|
||||||
|
|
||||||
|
* Fri Aug 19 2022 Dan Horák <dan[at]danny.cz> - 2:2.23.0-1
|
||||||
|
- rebased to 2.23.0
|
||||||
|
|
||||||
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.22.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 20 2022 Dan Horák <dan[at]danny.cz> - 2:2.22.0-1
|
||||||
|
- rebased to 2.22.0
|
||||||
|
|
||||||
|
* Tue May 31 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-2
|
||||||
|
- do not fail on emtpy /proc/cmdline when installing kernel (#1899759)
|
||||||
|
|
||||||
|
* Fri Apr 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-1
|
||||||
|
- rebased to 2.21.0
|
||||||
|
|
||||||
|
* Mon Feb 07 2022 Dan Horák <dan[at]danny.cz> - 2:2.20.0-1
|
||||||
|
- rebased to 2.20.0
|
||||||
|
- switch to fuse3
|
||||||
|
|
||||||
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.19.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Nov 26 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-2
|
||||||
|
- update ccw udev rules
|
||||||
|
|
||||||
|
* Fri Nov 12 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1
|
||||||
|
- rebased to 2.19.0
|
||||||
|
- cmsfs-fuse Requires glibc-gconv-extra (#2022652)
|
||||||
|
|
||||||
|
* Wed Oct 20 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-2
|
||||||
|
- move vmcp to core (#1931287)
|
||||||
|
|
||||||
|
* Tue Oct 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-1
|
||||||
|
- rebased to 2.18.0
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.17.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 07 2021 Dan Horák <dan[at]danny.cz> - 2:2.17.0-1
|
||||||
|
- rebased to 2.17.0
|
||||||
|
- zfcpconf: set exit code explicitly (#1977434)
|
||||||
|
- mk-s390image script requires file (#1973239)
|
||||||
|
- drop obsolete setting from device_cio_free.service (#1972449)
|
||||||
|
|
||||||
* Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-2
|
* Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-2
|
||||||
- drop superfluous Require from s390utils-base
|
- drop superfluous Require from s390utils-base
|
||||||
|
|
||||||
|
3
sources
3
sources
@ -1 +1,2 @@
|
|||||||
SHA512 (s390-tools-2.16.0.tar.gz) = d0866e2f372ba2938ccab264846d6cfe3db1b760cff6645fbefcd33a8ce8e7d971e442ccefda7e8e4d59818293147caa57fa593a3e66cd77e1e661928336793c
|
SHA512 (s390-tools-2.31.0.tar.gz) = d05722dff760605baad92b25a7a9264b3c936ff851b87a02ab39604a74d02ae4e14632d9b3d83eb9cb82a14bfcbb0d40bb4797896051ed3dd36d7690abfb1c64
|
||||||
|
SHA512 (s390-tools-2.31.0-rust-vendor.tar.xz) = f9dc2887bb2502ba6f71ef7ea807380c322a46df8c65f0fc7993f3fb4eec4da120369d3e380dbcca9b6250307da0f6236a649504d542f44730e8009ace8ed450
|
||||||
|
@ -36,7 +36,7 @@ if [ -f "$CONFIG" ]; then
|
|||||||
modprobe zfcp
|
modprobe zfcp
|
||||||
fi
|
fi
|
||||||
if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
|
if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
|
||||||
return
|
exit 1
|
||||||
fi
|
fi
|
||||||
sed 'y/ABCDEF/abcdef/' < $CONFIG | while read line; do
|
sed 'y/ABCDEF/abcdef/' < $CONFIG | while read line; do
|
||||||
case $line in
|
case $line in
|
||||||
@ -74,3 +74,4 @@ if [ -f "$CONFIG" ]; then
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
exit 0
|
||||||
|
Loading…
Reference in New Issue
Block a user