forked from pool/s390-tools
Compare commits
17 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
f226d43bc0 | ||
|
e553b3bcf0 | ||
|
1aa732b1b1 | ||
|
989dd03b90 | ||
|
a05add60ad | ||
|
549859fb33 | ||
|
37e471ec3d | ||
|
88b4cf9a55 | ||
|
d2403fb3d3 | ||
|
512d2a1762 | ||
|
e0449582f8 | ||
|
9e3bfc4f53 | ||
|
5f5c63d1e2 | ||
|
f85aac9036 | ||
|
e47d5e3f02 | ||
|
a5e2fe96bd | ||
|
aaa3221da7 |
@ -44,6 +44,14 @@ debug_mesg () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_cio_channel() {
|
||||||
|
echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_cio_channel() {
|
||||||
|
[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
echo "Usage: ${0} <read channel> <write channel> <online> [<protocol>]"
|
echo "Usage: ${0} <read channel> <write channel> <online> [<protocol>]"
|
||||||
echo " read/write channel = x.y.ssss where"
|
echo " read/write channel = x.y.ssss where"
|
||||||
@ -112,3 +120,9 @@ RC=${?}
|
|||||||
if [ ${RC} -ne 0 ]; then
|
if [ ${RC} -ne 0 ]; then
|
||||||
exit ${RC}
|
exit ${RC}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ${ON_OFF} == 1 ]; then
|
||||||
|
add_cio_channel "${CTC_READ_CHAN},${CTC_WRITE_CHAN}"
|
||||||
|
else remove_cio_channel "${CTC_READ_CHAN}"
|
||||||
|
remove_cio_channel "${CTC_WRITE_CHAN}"
|
||||||
|
fi
|
||||||
|
@ -43,6 +43,14 @@ debug_mesg () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_cio_channel() {
|
||||||
|
echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_cio_channel() {
|
||||||
|
[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
echo "Usage: ${0} [-f -t <dasd_type> ] <ccwid> <online> [use_diag]"
|
echo "Usage: ${0} [-f -t <dasd_type> ] <ccwid> <online> [use_diag]"
|
||||||
echo
|
echo
|
||||||
@ -157,4 +165,9 @@ elif [ ${ON_OFF} == 1 ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ${ON_OFF} == 1 ]; then
|
||||||
|
add_cio_channel "${CCW_CHAN_ID}"
|
||||||
|
else remove_cio_channel "${CCW_CHAN_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
exit ${exitcode}
|
exit ${exitcode}
|
||||||
|
@ -43,6 +43,14 @@ debug_mesg () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_cio_channel() {
|
||||||
|
echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_cio_channel() {
|
||||||
|
[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
echo "Usage: ${0} [-f -t <dasd_type> ] <ccwid> <online> [use_diag]"
|
echo "Usage: ${0} [-f -t <dasd_type> ] <ccwid> <online> [use_diag]"
|
||||||
echo
|
echo
|
||||||
@ -157,4 +165,9 @@ elif [ ${ON_OFF} == 1 ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ${ON_OFF} == 1 ]; then
|
||||||
|
add_cio_channel "${CCW_CHAN_ID}"
|
||||||
|
else remove_cio_channel "${CCW_CHAN_ID}"
|
||||||
|
fi
|
||||||
|
|
||||||
exit ${exitcode}
|
exit ${exitcode}
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018-2024 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
|
|
||||||
# load pkey module at boot time
|
# load pkey module at boot time
|
||||||
pkey
|
pkey
|
||||||
|
pkey_cca
|
||||||
|
pkey_ep11
|
||||||
|
pkey_pckmo
|
||||||
|
@ -48,6 +48,14 @@ debug_mesg () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_cio_channel() {
|
||||||
|
echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_cio_channel() {
|
||||||
|
[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
echo "Usage: ${0} [options] <read chan> <write chan> <data chan> <online>"
|
echo "Usage: ${0} [options] <read chan> <write chan> <data chan> <online>"
|
||||||
echo " -i Configure IP takeover"
|
echo " -i Configure IP takeover"
|
||||||
@ -157,3 +165,10 @@ RC=${?}
|
|||||||
if [ ${RC} -ne 0 ]; then
|
if [ ${RC} -ne 0 ]; then
|
||||||
exit ${RC}
|
exit ${RC}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ${ON_OFF} == 1 ]; then
|
||||||
|
add_cio_channel "${QETH_READ_CHAN},${QETH_WRITE_CHAN},${QETH_DATA_CHAN}"
|
||||||
|
else remove_cio_channel "${QETH_READ_CHAN}"
|
||||||
|
remove_cio_channel "${QETH_WRITE_CHAN}"
|
||||||
|
remove_cio_channel "${QETH_DATA_CHAN}"
|
||||||
|
fi
|
||||||
|
@ -0,0 +1,67 @@
|
|||||||
|
From 2d26a63806d2847f549c06276070a636a61bcb80 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eduard Shishkin <edward6@linux.ibm.com>
|
||||||
|
Date: Wed, 4 Dec 2024 13:37:46 +0100
|
||||||
|
Subject: [PATCH s390-tools] zipl_helper.device-mapper: add missed step in
|
||||||
|
logical device resolution
|
||||||
|
|
||||||
|
This fixes 670bf3e
|
||||||
|
|
||||||
|
Preparing a loop device for IPL by zipl tool, using its partition as
|
||||||
|
zipl target, leads to inconsistent installation setup. The problem is in
|
||||||
|
a missed step in the procedure of logical device resolution performed
|
||||||
|
by the script zipl_helper.device-mapper:
|
||||||
|
|
||||||
|
\# lsblk
|
||||||
|
|
||||||
|
NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT
|
||||||
|
loop0 7:0 0 5G 0 loop
|
||||||
|
|-loop0p1 253:15 0 128M 0 part
|
||||||
|
`-loop0p2 253:16 0 4.9G 0 part /mnt
|
||||||
|
|
||||||
|
\# ./zipl_helper.device-mapper 253:16
|
||||||
|
|
||||||
|
Expected result:
|
||||||
|
|
||||||
|
targetbase=7:0
|
||||||
|
targettype=SCSI
|
||||||
|
targetblocksize=4096
|
||||||
|
targetoffset=32784
|
||||||
|
|
||||||
|
Actual result:
|
||||||
|
|
||||||
|
targetbase=253:16
|
||||||
|
targettype=SCSI
|
||||||
|
targetblocksize=4096
|
||||||
|
targetoffset=32784
|
||||||
|
|
||||||
|
The fixup adds a missed resolution step.
|
||||||
|
|
||||||
|
Reference-ID: LTC210771
|
||||||
|
Signed-off-by: Eduard Shishkin <edward6@linux.ibm.com>
|
||||||
|
---
|
||||||
|
zipl/src/zipl_helper.device-mapper.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/zipl_helper.device-mapper.c b/zipl/src/zipl_helper.device-mapper.c
|
||||||
|
index aca52be1..918c5aba 100644
|
||||||
|
--- a/zipl/src/zipl_helper.device-mapper.c
|
||||||
|
+++ b/zipl/src/zipl_helper.device-mapper.c
|
||||||
|
@@ -1306,13 +1306,13 @@ static int complete_physical_device(struct physical_device *pd, dev_t *base_dev)
|
||||||
|
*base_dev = base_entry->dev.dev;
|
||||||
|
} else {
|
||||||
|
/*
|
||||||
|
- * In this case base device is the uppermost logical
|
||||||
|
+ * In this case base device is the uppermost
|
||||||
|
* device which provides access to boot sectors
|
||||||
|
*/
|
||||||
|
base_entry = find_base_entry(pd->dmpath, dc->bootsectors);
|
||||||
|
if (!base_entry)
|
||||||
|
return -1;
|
||||||
|
- *base_dev = base_entry->dev.dev;
|
||||||
|
+ *base_dev = first_device_by_target_data(base_entry->target);
|
||||||
|
}
|
||||||
|
/* Check for valid offset of filesystem */
|
||||||
|
if ((pd->offset % (dc->blocksize / SECTOR_SIZE)) != 0) {
|
||||||
|
--
|
||||||
|
2.39.0
|
||||||
|
|
@ -0,0 +1,63 @@
|
|||||||
|
From 592a016a1095fa9813f0bae8256433ba5af4ab9b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Eduard Shishkin <edward6@linux.ibm.com>
|
||||||
|
Date: Sat, 7 Dec 2024 12:48:12 +0100
|
||||||
|
Subject: [PATCH s390-tools 2/2] zipl/src: fix imprecise check that file is on
|
||||||
|
specified device
|
||||||
|
|
||||||
|
This fixes c0f02d2
|
||||||
|
|
||||||
|
The check that file is on specified disk is imprecise: In case when
|
||||||
|
target parameters are specified by user, the check compares a logical
|
||||||
|
device with a base disk, which is incorrect.
|
||||||
|
|
||||||
|
The fixup makes the check compare base disks (a specified one with
|
||||||
|
the base disk determined by disk_get_info() procedure).
|
||||||
|
|
||||||
|
Signed-off-by: Eduard Shishkin <edward6@linux.ibm.com>
|
||||||
|
---
|
||||||
|
zipl/src/bootmap.c | 9 +++++----
|
||||||
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/bootmap.c b/zipl/src/bootmap.c
|
||||||
|
index 7d340156..880b93ce 100644
|
||||||
|
--- a/zipl/src/bootmap.c
|
||||||
|
+++ b/zipl/src/bootmap.c
|
||||||
|
@@ -299,14 +299,15 @@ create_component_header(void* buffer, component_header_type type)
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
- * Not precise check that the file FILENAME locates on specified physical DISK.
|
||||||
|
+ * Not precise check that the file FILENAME locates on the physical
|
||||||
|
+ * disk specified by WHERE.
|
||||||
|
*
|
||||||
|
* Try to auto-detect parameters of the disk which the file locates on
|
||||||
|
* and compare found device-ID with DISK.
|
||||||
|
* Return 0, if auto-detection succeeded, and it is proven that the
|
||||||
|
* file does NOT locate on DISK. Otherwise, return 1.
|
||||||
|
*/
|
||||||
|
-static int file_is_on_disk(const char *filename, dev_t disk)
|
||||||
|
+static int file_is_on_disk(const char *filename, struct disk_info *where)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Retrieve info of the underlying disk without any user hints
|
||||||
|
@@ -331,7 +332,7 @@ static int file_is_on_disk(const char *filename, dev_t disk)
|
||||||
|
"Warning: Preparing a logical device for boot might fail\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
- if (info->device != disk) {
|
||||||
|
+ if (info->basedisks[0] != where->basedisks[0]) {
|
||||||
|
disk_free_info(info);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -378,7 +379,7 @@ static int add_component_file_range(struct install_set *bis,
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
- if (!file_is_on_disk(filename, bis->info->device)) {
|
||||||
|
+ if (!file_is_on_disk(filename, bis->info)) {
|
||||||
|
error_reason("File is not on target device");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.39.0
|
||||||
|
|
@ -1,51 +0,0 @@
|
|||||||
From 6a55d0c2e57952600164822dd100e8247b4b010f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Steffen Eiden <seiden@linux.ibm.com>
|
|
||||||
Date: Fri, 23 Aug 2024 09:16:26 +0200
|
|
||||||
Subject: [PATCH] rust/pv: Lower most lints to warn
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Lower the lint level to warn for the styling lints.
|
|
||||||
This avoids compile issues during packaging for newer tooling with
|
|
||||||
potential more lint findings.
|
|
||||||
Still deny compiling if a public symbol has no documentation.
|
|
||||||
|
|
||||||
Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/173
|
|
||||||
Reviewed-by: Jan Höppner <hoeppner@linux.ibm.com>
|
|
||||||
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
|
|
||||||
---
|
|
||||||
rust/pv/src/lib.rs | 4 ++--
|
|
||||||
rust/pv_core/src/lib.rs | 4 ++--
|
|
||||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/rust/pv/src/lib.rs b/rust/pv/src/lib.rs
|
|
||||||
index 9a647617..1084f8e8 100644
|
|
||||||
--- a/rust/pv/src/lib.rs
|
|
||||||
+++ b/rust/pv/src/lib.rs
|
|
||||||
@@ -2,8 +2,8 @@
|
|
||||||
//
|
|
||||||
// Copyright IBM Corp. 2023, 2024
|
|
||||||
|
|
||||||
-#![deny(
|
|
||||||
- missing_docs,
|
|
||||||
+#![deny(missing_docs)]
|
|
||||||
+#![warn(
|
|
||||||
missing_debug_implementations,
|
|
||||||
trivial_numeric_casts,
|
|
||||||
unstable_features,
|
|
||||||
diff --git a/rust/pv_core/src/lib.rs b/rust/pv_core/src/lib.rs
|
|
||||||
index 1356c1b7..b617b8f9 100644
|
|
||||||
--- a/rust/pv_core/src/lib.rs
|
|
||||||
+++ b/rust/pv_core/src/lib.rs
|
|
||||||
@@ -1,8 +1,8 @@
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
//
|
|
||||||
// Copyright IBM Corp. 2023, 2024
|
|
||||||
-#![deny(
|
|
||||||
- missing_docs,
|
|
||||||
+#![deny(missing_docs)]
|
|
||||||
+#![warn(
|
|
||||||
missing_debug_implementations,
|
|
||||||
trivial_numeric_casts,
|
|
||||||
unstable_features,
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ea4758c4e460d7f7e040e6aedf68b1be32d63fecb733358b08182f6b9b7440a2
|
|
||||||
size 2114507
|
|
BIN
s390-tools-2.36.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
s390-tools-2.36.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,81 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 9 09:49:52 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
||||||
|
|
||||||
|
- Upgrade s390-tools to version 2.36 (jsc#PED-10303, jsc#PED-9591)
|
||||||
|
* s390-tools: Define Rust MSRV as 1.75.0
|
||||||
|
* Add new tools / libraries:
|
||||||
|
- cpacfinfo: Tool to provide CPACF information
|
||||||
|
- opticsmon: Tools to monitor optical modules for directly attached PCI based NICs
|
||||||
|
- pvimg: Rust rewrite of genprotimg
|
||||||
|
* Changes of existing tools:
|
||||||
|
- chpstat: Add data bandwidth utilization column
|
||||||
|
- chpstat: Add support for full CMCB
|
||||||
|
- chpstat: Add support for new CMG types
|
||||||
|
- dbginfo.sh: add overview commands and crypto update
|
||||||
|
- hyptop: Support for structured output (json, json-seq, csv)
|
||||||
|
- lszfcp: Add missing fallback marker for non-good fc_host port_state
|
||||||
|
- lszfcp: Improve speed with many SCSI devices
|
||||||
|
- pvattest: Add attestation policy check command
|
||||||
|
- zipl: Add support of partitions of mirror md-devices
|
||||||
|
* Bug Fixes:
|
||||||
|
- lszcrypt: Fix wrong state showing up for removed AP queue within SE guest
|
||||||
|
- lszfcp: Show device names line for zfcp_units without SCSI device
|
||||||
|
- Revendored vendor.tar.gz
|
||||||
|
- Applied additional patch (bsc#1233889, bsc#1233079)
|
||||||
|
* s390-tools-02-zipl-src-fix-imprecise-check-that-file-is-on-specifi.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 5 15:13:49 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
||||||
|
|
||||||
|
- Applied a patch (bsc#1233889)
|
||||||
|
* s390-tools-01-zipl_helper.device-mapper-add-missed-step-in-logical.patch
|
||||||
|
- Amended the /usr/lib/modules-load.d/pkey.conf (bsc#1233233). Added
|
||||||
|
* pkey_cca
|
||||||
|
* pkey_ep11
|
||||||
|
* pkey_pckmo
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 5 07:39:58 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
||||||
|
|
||||||
|
- Amended the *_configure scripts to update again the SUSE's specific file
|
||||||
|
'/boot/zipl/active_devices.txt' (bsc#1232474, bsc#1216257)
|
||||||
|
* ctc_configure
|
||||||
|
* dasd_configure
|
||||||
|
* qeth_configure
|
||||||
|
* zfcp_host_configure
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 8 10:35:04 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
||||||
|
|
||||||
|
* Upgrade s390-tools to version 2.35 (jsc#PED-9591, jsc#PED-10303)
|
||||||
|
* Changes of existing tools:
|
||||||
|
- cpacfstats: Add support for FULL XTS (MSA 10) and HMAC (MSA 11) PAI counter
|
||||||
|
- cpuplugd: Make cpuplugd compatible with hiperdispatch
|
||||||
|
- dbginfo.sh: Add network sockstat info
|
||||||
|
- pvapconfig: s390x exclusive build
|
||||||
|
- zdev: Add option to select IPL device
|
||||||
|
- zdump/dfo_s390: Support s390 DFO for vr-kernel dumps
|
||||||
|
- zipl: Add support of mirror devices
|
||||||
|
* Bug Fixes:
|
||||||
|
- (genprotimg|zipl)/boot: discard .note.package ELF section to save memory
|
||||||
|
- netboot/mk-s390image: Fix size when argument is a symlink
|
||||||
|
- ziorep_config: Fix warning message when multipath device is not there.
|
||||||
|
- zipl: Fix problems when target parameters are specified by user
|
||||||
|
- zipl: Fix segfault when creating device-based dumps with '--dry-run'
|
||||||
|
* Removed obsolete patches
|
||||||
|
- s390-tools-2.34-Fix-Rust-compilation-errors.patch
|
||||||
|
- s390-tools-01-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
|
||||||
|
- s390-tools-02-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
|
||||||
|
* Revendored vendor.tar.gz
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 16 12:49:55 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
||||||
|
|
||||||
|
* Applied patches (bsc#1230345)
|
||||||
|
- zipl/src: add basic support for multiple target base disks
|
||||||
|
- s390-tools-01-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
|
||||||
|
- s390-tools-02-zipl-src-add-basic-support-for-multiple-target-base-disks.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 26 09:17:17 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
Mon Aug 26 09:17:17 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: s390-tools
|
Name: s390-tools
|
||||||
Version: 2.34.0
|
Version: 2.36.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: S/390 tools like zipl and dasdfmt for s390x (plus selected tools for x86_64)
|
Summary: S/390 tools like zipl and dasdfmt for s390x (plus selected tools for x86_64)
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -153,20 +153,23 @@ Patch910: s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.p
|
|||||||
Patch911: s390-tools-sles15sp5-remove-no-pie-link-arguments.patch
|
Patch911: s390-tools-sles15sp5-remove-no-pie-link-arguments.patch
|
||||||
Patch912: s390-tools-ALP-zdev-live.patch
|
Patch912: s390-tools-ALP-zdev-live.patch
|
||||||
Patch913: s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch
|
Patch913: s390-tools-sles15sp6-kdump-initrd-59-zfcp-compat-rules.patch
|
||||||
Patch914: s390-tools-slfo-01-parse-ipl-device-for-activation.patch
|
Patch914: s390-tools-01-zipl_helper.device-mapper-add-missed-step-in-logical.patch
|
||||||
Patch915: s390-tools-2.34-Fix-Rust-compilation-errors.patch
|
Patch915: s390-tools-02-zipl-src-fix-imprecise-check-that-file-is-on-specifi.patch
|
||||||
|
###
|
||||||
|
Patch920: s390-tools-slfo-01-parse-ipl-device-for-activation.patch
|
||||||
###
|
###
|
||||||
|
|
||||||
BuildRequires: curl-devel
|
BuildRequires: curl-devel
|
||||||
BuildRequires: dracut
|
BuildRequires: dracut
|
||||||
BuildRequires: fuse3-devel
|
BuildRequires: fuse3-devel
|
||||||
BuildRequires: gcc13
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc13-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gettext-tools
|
BuildRequires: gettext-tools
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: glibc-devel-static
|
BuildRequires: glibc-devel-static
|
||||||
BuildRequires: libcryptsetup-devel > 2.0.3
|
BuildRequires: libcryptsetup-devel > 2.0.3
|
||||||
BuildRequires: libjson-c-devel
|
BuildRequires: libjson-c-devel
|
||||||
|
BuildRequires: libnl3-devel
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: mdevctl
|
BuildRequires: mdevctl
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
@ -225,12 +228,13 @@ zipl - boot loader and dump DASD initializer
|
|||||||
zgetdump - tool to get linux system dumps from DASD
|
zgetdump - tool to get linux system dumps from DASD
|
||||||
|
|
||||||
- x86_64
|
- x86_64
|
||||||
genprotimg - create a protected virtualization image
|
pvimg - create a protected virtualization image (genprotimg)
|
||||||
pvattest - create, perform, and verify protected virtualization attestation measurements
|
pvattest - create, perform, and verify protected virtualization attestation measurements
|
||||||
pvsecret - manage secrets for IBM Secure Execution guests.
|
pvsecret - manage secrets for IBM Secure Execution guests.
|
||||||
pvapconfig - used to automatically set up the AP configuration within an IBM Secure Execution guest.
|
|
||||||
|
|
||||||
Note: Auxiliary data package - s390-tools-genprotimg-data
|
Warning: There is an auxiliary data package - s390-tools-genprotimg-data.
|
||||||
|
To install s390-tools properly, please use:
|
||||||
|
'sudo zypper install s390-tools s390-tools-genprotimg-data'
|
||||||
|
|
||||||
%package -n osasnmpd
|
%package -n osasnmpd
|
||||||
Summary: OSA-Express SNMP subagent
|
Summary: OSA-Express SNMP subagent
|
||||||
@ -349,11 +353,11 @@ BuildArch: noarch
|
|||||||
Requires(pre): filesystem
|
Requires(pre): filesystem
|
||||||
|
|
||||||
%description genprotimg-data
|
%description genprotimg-data
|
||||||
The genprotimg allows preparing and analyzing boot images
|
The pvimg (genprotimg) allows preparing and analyzing boot images
|
||||||
in the realm of IBM Secure Execution on a trusted environment,
|
in the realm of IBM Secure Execution on a trusted environment,
|
||||||
such as the laptop of an admin by limiting the build targets
|
such as the laptop of an admin by limiting the build targets
|
||||||
depending on the defined or detected host architecture.
|
depending on the defined or detected host architecture.
|
||||||
This package provides auxiliary data used by genprotimg.
|
This package provides auxiliary data used by pvimg(genprotimg).
|
||||||
|
|
||||||
### *** s390x ************************************************************************* ###
|
### *** s390x ************************************************************************* ###
|
||||||
%ifarch s390x
|
%ifarch s390x
|
||||||
@ -363,7 +367,7 @@ This package provides auxiliary data used by genprotimg.
|
|||||||
|
|
||||||
cp -vi %{SOURCE22} CAUTION
|
cp -vi %{SOURCE22} CAUTION
|
||||||
|
|
||||||
install -D -m 0644 %{SOURCE200} .cargo/config
|
install -D -m 0644 %{SOURCE200} .cargo/config.toml
|
||||||
tar -xzf %{SOURCE201}
|
tar -xzf %{SOURCE201}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -380,11 +384,9 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
|
|||||||
DISTRELEASE=%{release} \
|
DISTRELEASE=%{release} \
|
||||||
UDEVRUNDIR=/run/udev \
|
UDEVRUNDIR=/run/udev \
|
||||||
HAVE_CARGO=1 \
|
HAVE_CARGO=1 \
|
||||||
HAVE_DRACUT=1 \
|
HAVE_DRACUT=1
|
||||||
CC=gcc-13 \
|
|
||||||
CXX=g++-13
|
|
||||||
### all
|
### all
|
||||||
gcc-13 -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
|
gcc -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/boot/zipl
|
mkdir -p %{buildroot}/boot/zipl
|
||||||
@ -395,9 +397,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/zkey/repository
|
|||||||
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
||||||
UDEVRUNDIR=/run/udev \
|
UDEVRUNDIR=/run/udev \
|
||||||
HAVE_CARGO=1 \
|
HAVE_CARGO=1 \
|
||||||
HAVE_DRACUT=1 \
|
HAVE_DRACUT=1
|
||||||
CC=gcc-13 \
|
|
||||||
CXX=g++-13
|
|
||||||
### all
|
### all
|
||||||
|
|
||||||
# The make install command puts things in /etc/sysconfig and not the
|
# The make install command puts things in /etc/sysconfig and not the
|
||||||
@ -719,7 +719,6 @@ done
|
|||||||
%dir %{_prefix}/lib/systemd/scripts
|
%dir %{_prefix}/lib/systemd/scripts
|
||||||
%dir %{_datadir}/s390-tools
|
%dir %{_datadir}/s390-tools
|
||||||
%dir %{_datadir}/s390-tools/netboot
|
%dir %{_datadir}/s390-tools/netboot
|
||||||
%dir %{_datadir}/s390-tools/genprotimg
|
|
||||||
%dir %{_prefix}/lib/dracut/modules.d/95zdev
|
%dir %{_prefix}/lib/dracut/modules.d/95zdev
|
||||||
%dir %{_prefix}/lib/dracut/modules.d/95zdev-kdump
|
%dir %{_prefix}/lib/dracut/modules.d/95zdev-kdump
|
||||||
%dir %{_prefix}/lib/dracut/modules.d/96zdev-live
|
%dir %{_prefix}/lib/dracut/modules.d/96zdev-live
|
||||||
@ -742,8 +741,8 @@ done
|
|||||||
%dir /etc/mdevctl.d/scripts.d/callouts/
|
%dir /etc/mdevctl.d/scripts.d/callouts/
|
||||||
###
|
###
|
||||||
%exclude /lib/s390-tools/stage3.bin
|
%exclude /lib/s390-tools/stage3.bin
|
||||||
%exclude %{_datadir}/s390-tools/genprotimg/stage3a.bin
|
%exclude %{_datadir}/s390-tools/pvimg/stage3a.bin
|
||||||
%exclude %{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin
|
%exclude %{_datadir}/s390-tools/pvimg/stage3b_reloc.bin
|
||||||
###
|
###
|
||||||
|
|
||||||
%files -n osasnmpd -f %{_builddir}/%{name}.osasnmp
|
%files -n osasnmpd -f %{_builddir}/%{name}.osasnmp
|
||||||
@ -794,8 +793,9 @@ done
|
|||||||
### genprotimg
|
### genprotimg
|
||||||
%files genprotimg-data
|
%files genprotimg-data
|
||||||
/lib/s390-tools/stage3.bin
|
/lib/s390-tools/stage3.bin
|
||||||
%{_datadir}/s390-tools/genprotimg/stage3a.bin
|
%dir %{_datadir}/s390-tools/pvimg
|
||||||
%{_datadir}/s390-tools/genprotimg/stage3b_reloc.bin
|
%{_datadir}/s390-tools/pvimg/stage3a.bin
|
||||||
|
%{_datadir}/s390-tools/pvimg/stage3b_reloc.bin
|
||||||
|
|
||||||
### _endif
|
### _endif
|
||||||
### *** !s390x ************************************************************************* ###
|
### *** !s390x ************************************************************************* ###
|
||||||
@ -811,6 +811,7 @@ tar -xzf %{SOURCE201}
|
|||||||
%build
|
%build
|
||||||
export OPT_FLAGS="%{optflags}"
|
export OPT_FLAGS="%{optflags}"
|
||||||
export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
|
export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
|
||||||
|
|
||||||
%make_build \
|
%make_build \
|
||||||
DISTRELEASE=%{release} \
|
DISTRELEASE=%{release} \
|
||||||
UDEVRUNDIR=/run/udev \
|
UDEVRUNDIR=/run/udev \
|
||||||
@ -818,6 +819,7 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
|
|||||||
HAVE_DRACUT=1
|
HAVE_DRACUT=1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
%make_install \
|
%make_install \
|
||||||
DISTRELEASE=%{release} \
|
DISTRELEASE=%{release} \
|
||||||
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
||||||
@ -828,8 +830,8 @@ export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
|
|||||||
%files
|
%files
|
||||||
%{_prefix}/bin/*
|
%{_prefix}/bin/*
|
||||||
%dir %{_datadir}/s390-tools
|
%dir %{_datadir}/s390-tools
|
||||||
%dir %{_datadir}/s390-tools/genprotimg
|
%dir %{_datadir}/s390-tools/pvimg
|
||||||
%{_datadir}/s390-tools/genprotimg/check_hostkeydoc
|
%{_datadir}/s390-tools/pvimg/check_hostkeydoc
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
BIN
vendor.tar.gz
(Stored with Git LFS)
BIN
vendor.tar.gz
(Stored with Git LFS)
Binary file not shown.
@ -38,6 +38,14 @@ debug_mesg () {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_cio_channel() {
|
||||||
|
echo "$* # ${DATE}" >> /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_cio_channel() {
|
||||||
|
[ -w /boot/zipl/active_devices.txt ] && sed -i -e "/^${1}/d" /boot/zipl/active_devices.txt
|
||||||
|
}
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
echo "Usage: ${0} <ccwid> <online>"
|
echo "Usage: ${0} <ccwid> <online>"
|
||||||
echo " ccwid = x.y.ssss where"
|
echo " ccwid = x.y.ssss where"
|
||||||
@ -80,3 +88,8 @@ RC=${?}
|
|||||||
if [ ${RC} -ne 0 ]; then
|
if [ ${RC} -ne 0 ]; then
|
||||||
exit ${RC}
|
exit ${RC}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ${ON_OFF} == 1 ]; then
|
||||||
|
add_cio_channel "${CCW_CHAN_ID}"
|
||||||
|
else remove_cio_channel "${CCW_CHAN_ID}"
|
||||||
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user