From 9aeeea236fc9054171ce34c425a90ec0a858d304 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 04:41:16 +0000 Subject: [PATCH 01/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- s390utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 3fc3870..d3ad760 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.33.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -1067,6 +1067,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2:2.33.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Dan Horák - 2:2.33.1-3 - "which" is not required any more - Revert "zipl/src: Fix problems when target parameters are specified by user" From 4ac12c1bd1b4687eb489583cc88ec404c0364b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 12 Aug 2024 11:52:33 +0000 Subject: [PATCH 02/29] - rebased to 2.34.0 (rhbz#2302462) --- s390utils-2.33.1-fedora.patch | 311 ---------------------------------- s390utils-2.34.0-fedora.patch | 0 s390utils.spec | 9 +- sources | 4 +- 4 files changed, 8 insertions(+), 316 deletions(-) delete mode 100644 s390utils-2.33.1-fedora.patch create mode 100644 s390utils-2.34.0-fedora.patch diff --git a/s390utils-2.33.1-fedora.patch b/s390utils-2.33.1-fedora.patch deleted file mode 100644 index c97b193..0000000 --- a/s390utils-2.33.1-fedora.patch +++ /dev/null @@ -1,311 +0,0 @@ -From ab26b43985f44b71abf40f8d0e50bfbd0808f8b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20H=C3=B6ppner?= -Date: Fri, 14 Jun 2024 14:25:40 +0200 -Subject: [PATCH 1/2] s390-tools: Replace 'which' with built-in 'command -v' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There are still a few scripts using the 'which' command to determine -either the full path or the mere existence of an executable. -Some of these scripts might run in minimal environments where 'which' is -not available due to dependency restriction. 'which' is also considered -unreliable for historical implementation details. - -Use the POSIX defined [1] built-in 'command -v' instead to reduce -package dependencies and improve reliability. - -[1] https://pubs.opengroup.org/onlinepubs/9699919799/ -Reviewed-by: Benjamin Block -Signed-off-by: Jan Höppner -Signed-off-by: Steffen Eiden -(cherry picked from commit 0b0960254e8c2b556cefa97f83651a92f54a5e42) ---- - iucvterm/doc/ts-shell/iucvconn_on_login | 2 +- - netboot/mk-pxelinux-ramfs | 2 +- - ziomon/ziomon | 3 +-- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/iucvterm/doc/ts-shell/iucvconn_on_login b/iucvterm/doc/ts-shell/iucvconn_on_login -index 860c4cc..92010df 100755 ---- a/iucvterm/doc/ts-shell/iucvconn_on_login -+++ b/iucvterm/doc/ts-shell/iucvconn_on_login -@@ -15,7 +15,7 @@ - prog_name=`basename $0` - guest_name=${USER:-`whoami 2>/dev/null`} - terminal=lnxhvc0 --iucvconn=`which iucvconn 2>/dev/null` -+iucvconn=`command -v iucvconn 2>/dev/null` - - __error() { - printf "$prog_name: $@\n" >&2 -diff --git a/netboot/mk-pxelinux-ramfs b/netboot/mk-pxelinux-ramfs -index 64ebde1..07f8b07 100755 ---- a/netboot/mk-pxelinux-ramfs -+++ b/netboot/mk-pxelinux-ramfs -@@ -127,7 +127,7 @@ echo "$cmd: Copying kexec" - # Install both binary and required shared libraries - OLDPATH=$PATH - PATH=$OLDPATH:/sbin:/usr/sbin --kexec_bin=$(which kexec) -+kexec_bin=$(command -v kexec) - kexec_sos=$(sharedobjs $kexec_bin) - PATH=$OLDPATH - -diff --git a/ziomon/ziomon b/ziomon/ziomon -index fd6248a..d1545cc 100755 ---- a/ziomon/ziomon -+++ b/ziomon/ziomon -@@ -667,8 +667,7 @@ function check_free_space_mileage() { - - - function check_blktrace() { -- which blktrace >/dev/null 2>&1; -- if [ $? -ne 0 ]; then -+ if ! command -v blktrace >/dev/null 2>&1; then - echo "$WRP_TOOLNAME: Could not find blktrace. Please make sure that the blktrace package is installed and matches the level in the documentation."; - exit 1; - fi --- -2.45.2 - - -From 9770d8bff4b2ef6f01af1c273d1eac121b672a85 Mon Sep 17 00:00:00 2001 -From: Marc Hartmayer -Date: Thu, 6 Jun 2024 15:07:45 +0000 -Subject: [PATCH 2/2] Revert "zipl/src: Fix problems when target parameters are - specified by user" - -The commit fb0b6263d1a9 ("zipl/src: Fix problems when target parameters -are specified by user") breaks the case where the user has to provide -all target attributes via the zipl command line, because the target -device cannot be used to retrieve those attributes. - -$ zipl -V --blsdir /tmp/tmp.xHmFUdgBCi/boot//loader/entries/ --config /tmp/tmp.dSv9MJ3svs -Looking for components in '/lib/s390-tools' -Using config file '/tmp/tmp.dSv9MJ3svs' (from command line) -Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//50_normal.conf' -Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//45_normal_swiotlb.conf' -Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//40_pv.conf' -Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//30_pv_reboot.conf' -Secure boot support: yes -Target device information - Device..........................: 2b:00 - Device name.....................: nbd0 *) - Device driver name..............: nbd - Type............................: disk device - Disk layout.....................: SCSI disk layout *) - Geometry - start................: 2048 *) - File system block size..........: 4096 - Physical block size.............: 512 *) - Device size in physical blocks..: 2095071 - *) Data provided by user. -Building bootmap in '/tmp/tmp.xHmFUdgBCi/boot/' -Building menu 'zipl-automatic-menu' -Adding #1: IPL section 'Normal Guest' (default) - initial ramdisk...: /tmp/tmp.xHmFUdgBCi/boot//ramdisk-s390x - kernel image......: /tmp/tmp.xHmFUdgBCi/boot//vmlinux-s390x -zIPL environment block content: -Error: Could not add image file '/tmp/tmp.xHmFUdgBCi/boot//vmlinux-s390x': Could not get disk geometry - -This reverts commit fb0b6263d1a9a497760a21ccb178748ec5ccf955. - -Acked-by: Eduard Shishkin -Signed-off-by: Marc Hartmayer -Signed-off-by: Steffen Eiden -(cherry picked from commit 63ff07ba38dda99e2661a097d05266555c727a2e) ---- - zipl/include/job.h | 1 - - zipl/src/bootmap.c | 40 +++++++++++++++++++--------------------- - zipl/src/disk.c | 3 --- - zipl/src/job.c | 3 ++- - 4 files changed, 21 insertions(+), 26 deletions(-) - -diff --git a/zipl/include/job.h b/zipl/include/job.h -index e46788b..597d400 100644 ---- a/zipl/include/job.h -+++ b/zipl/include/job.h -@@ -152,7 +152,6 @@ static inline int target_parameters_are_set(struct job_target_data *td) - - int job_get(int argc, char* argv[], struct job_data** data); - void job_free(struct job_data* job); --void free_target_data(struct job_target_data *td); - int type_from_target(char *target, disk_type_t *type); - int check_job_dump_images(struct job_dump_data* dump, char* name); - int check_job_images_ngdump(struct job_dump_data* dump, char* name); -diff --git a/zipl/src/bootmap.c b/zipl/src/bootmap.c -index 82b77d0..f6f5bac 100644 ---- a/zipl/src/bootmap.c -+++ b/zipl/src/bootmap.c -@@ -304,6 +304,7 @@ static int add_component_file_range(struct install_set *bis, - address_t load_address, - size_t trailer, void *component, - int add_files, -+ struct job_target_data *target, - int comp_id, int menu_idx, - int program_table_id) - { -@@ -338,15 +339,8 @@ static int add_component_file_range(struct install_set *bis, - return -1; - } - } else { -- /* -- * Make sure that file is on target device. -- * For this, retrieve info of the underlying disk without -- * any user hints -- */ -- struct job_target_data tmp = {.source = source_unknown}; -- -- rc = disk_get_info_from_file(filename, &tmp, &file_info); -- free_target_data(&tmp); -+ /* Make sure file is on correct device */ -+ rc = disk_get_info_from_file(filename, target, &file_info); - if (rc) - return -1; - if (file_info->device != bis->info->device) { -@@ -383,11 +377,12 @@ write_segment_table: - static int add_component_file(struct install_set *bis, const char *filename, - address_t load_address, size_t trailer, - void *component, int add_files, -- int comp_id, int menu_idx, int program_table_id) -+ struct job_target_data *target, int comp_id, -+ int menu_idx, int program_table_id) - { - return add_component_file_range(bis, filename, NULL, load_address, - trailer, component, add_files, -- comp_id, menu_idx, -+ target, comp_id, menu_idx, - program_table_id); - } - -@@ -549,7 +544,8 @@ static int add_ipl_program(struct install_set *bis, char *filename, - bool add_envblk, struct job_envblk_data *envblk, - struct job_ipl_data *ipl, disk_blockptr_t *program, - int verbose, int add_files, component_header_type type, -- int is_secure, int menu_idx, int program_table_id) -+ struct job_target_data *target, int is_secure, -+ int menu_idx, int program_table_id) - { - struct signature_header sig_head; - size_t ramdisk_size, image_size; -@@ -671,7 +667,7 @@ static int add_ipl_program(struct install_set *bis, char *filename, - /* Add stage 3 loader to bootmap */ - rc = add_component_file(bis, ZIPL_STAGE3_PATH, STAGE3_LOAD_ADDRESS, - signature_size, VOID_ADD(table, offset), 1, -- COMPONENT_ID_LOADER, menu_idx, -+ target, COMPONENT_ID_LOADER, menu_idx, - program_table_id); - if (rc) { - error_text("Could not add internal loader file '%s'", -@@ -749,7 +745,7 @@ static int add_ipl_program(struct install_set *bis, char *filename, - - rc = add_component_file(bis, ipl->common.image, ipl->common.image_addr, - signature_size, VOID_ADD(table, offset), -- add_files, COMPONENT_ID_KERNEL_IMAGE, -+ add_files, target, COMPONENT_ID_KERNEL_IMAGE, - menu_idx, program_table_id); - if (rc) { - error_text("Could not add image file '%s'", ipl->common.image); -@@ -809,7 +805,7 @@ static int add_ipl_program(struct install_set *bis, char *filename, - ipl->common.ramdisk_addr, - signature_size, - VOID_ADD(table, offset), -- add_files, COMPONENT_ID_RAMDISK, -+ add_files, target, COMPONENT_ID_RAMDISK, - menu_idx, program_table_id); - if (rc) { - error_text("Could not add ramdisk '%s'", -@@ -865,7 +861,7 @@ static int add_ipl_program(struct install_set *bis, char *filename, - rc = add_component_file_range(bis, filename, ®, - ipl->envblk_addr, 0, - VOID_ADD(table, offset), -- 0, -+ 0, target, - COMPONENT_ID_ENVBLK, - menu_idx, - program_table_id); -@@ -897,6 +893,7 @@ static int add_segment_program(struct install_set *bis, - struct job_segment_data *segment, - disk_blockptr_t *program, int verbose, - int add_files, component_header_type type, -+ struct job_target_data *target, - int program_table_id) - { - void *table; -@@ -916,7 +913,7 @@ static int add_segment_program(struct install_set *bis, - printf(" segment file......: %s\n", segment->segment); - - rc = add_component_file(bis, segment->segment, segment->segment_addr, 0, -- VOID_ADD(table, offset), add_files, -+ VOID_ADD(table, offset), add_files, target, - COMPONENT_ID_SEGMENT_FILE, 0 /* menu_idx */, - program_table_id); - if (rc) { -@@ -999,7 +996,7 @@ static int add_dump_program(struct install_set *bis, struct job_data *job, - ipl.common.parmline = dump->common.parmline; - ipl.common.parm_addr = dump->common.parm_addr; - return add_ipl_program(bis, NULL, false, NULL, &ipl, program, -- verbose, 1, type, SECURE_BOOT_DISABLED, -+ verbose, 1, type, target, SECURE_BOOT_DISABLED, - 0 /* menu_idx */, program_table_id); - } - -@@ -1044,7 +1041,8 @@ static int build_program_table(struct job_data *job, - true, &job->envblk, &job->data.ipl, - &table[0], verbose || job->command_line, - job->add_files, component_header, -- job->is_secure, 0, program_table_id); -+ &job->target, job->is_secure, 0, -+ program_table_id); - break; - case job_segment: - if (bis->print_details) { -@@ -1057,7 +1055,7 @@ static int build_program_table(struct job_data *job, - rc = add_segment_program(bis, &job->data.segment, &table[0], - verbose || job->command_line, - job->add_files, COMPONENT_HEADER_IPL, -- program_table_id); -+ &job->target, program_table_id); - break; - case job_dump_partition: - /* Only useful for a partition dump that uses a dump kernel*/ -@@ -1116,7 +1114,7 @@ static int build_program_table(struct job_data *job, - &table[job->data.menu.entry[i].pos], - verbose || job->command_line, - job->add_files, component_header, -- is_secure, i, -+ &job->target, is_secure, i, - program_table_id); - break; - case job_print_usage: -diff --git a/zipl/src/disk.c b/zipl/src/disk.c -index b4bd49a..38a637c 100644 ---- a/zipl/src/disk.c -+++ b/zipl/src/disk.c -@@ -528,9 +528,6 @@ static int disk_set_info_complete(struct job_target_data *td, - * config file, or special "target options" of zipl tool. - * If target parameters were specified by user, then the step 1 above - * is skipped. -- -- * To exclude any user assumptions about the DEVICE, this function -- * should be called with TD pointing to a zeroed structure. - * - * DEVICE: logical, or physical device, optionally formated with a - * file system. -diff --git a/zipl/src/job.c b/zipl/src/job.c -index 2066402..27f0181 100644 ---- a/zipl/src/job.c -+++ b/zipl/src/job.c -@@ -370,7 +370,8 @@ get_command_line(int argc, char* argv[], struct command_line* line) - } - - --void free_target_data(struct job_target_data *data) -+static void -+free_target_data(struct job_target_data* data) - { - free(data->bootmap_dir); - free(data->targetbase); --- -2.45.2 - diff --git a/s390utils-2.34.0-fedora.patch b/s390utils-2.34.0-fedora.patch new file mode 100644 index 0000000..e69de29 diff --git a/s390utils.spec b/s390utils.spec index d3ad760..6bf2935 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -13,8 +13,8 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.33.1 -Release: 4%{?dist} +Version: 2.34.0 +Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -47,7 +47,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -Patch100: s390utils-%{version}-fedora.patch +#Patch100: s390utils-%%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -1067,6 +1067,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Mon Aug 12 2024 Dan Horák - 2:2.34.0-1 +- rebased to 2.34.0 (rhbz#2302462) + * Sat Jul 20 2024 Fedora Release Engineering - 2:2.33.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e20d197..414897d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.33.1.tar.gz) = 8e5cba1e5264787a2f89b340d4d9372df7cd28ae9fa263dcbc6cbbf460e48c1db167110ff901f35f82e36d0d8c97105acd7167b40d889a829c71b182e175b96c -SHA512 (s390-tools-2.33.1-rust-vendor.tar.xz) = 12b0d3af1eba223b63028b5fec85ff4cc79ec646671e56d4c3606b0b4a9d3f79469dc860141ff86e9a0fd2bc1d54f32f2588615997a9865adbe20a110237b98d +SHA512 (s390-tools-2.34.0.tar.gz) = 1ae9bc5e14efe818570227b326f6572fedb99afd9ffd68af649a1d736d9b963a068dd878bcea21b23b9368414c32a5d98aa2ea0aa7a260a9267d6331983dfcf8 +SHA512 (s390-tools-2.34.0-rust-vendor.tar.xz) = 77543e418cdac7628c0ddf562473b5fdd104679be572ed62b461dc2dd896a2f60c9f4aa366e9dd5c59ece09c6387ca52782c0f23f3e6b76adfc85c233b36351a From 33c843d37489e5de86f67414b510dd604d644bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 14 Aug 2024 09:09:23 +0000 Subject: [PATCH 03/29] be more specific for the rpminspect badfuncs check --- rpminspect.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rpminspect.yaml b/rpminspect.yaml index 8ca8a53..9d4a1bf 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -4,5 +4,6 @@ pathmigration: - /lib/s390-tools badfuncs: - ignore: - - /usr/sbin/qethqoat + allowed: + /usr/sbin/qethqoat: + - inet_ntoa From 35192dda78a42ed8395f79ec6b06056085fae114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 26 Aug 2024 13:11:02 +0200 Subject: [PATCH 04/29] - don't make Rust warnings fatal --- s390utils-2.34.0-fedora.patch | 55 +++++++++++++++++++++++++++++++++++ s390utils.spec | 7 +++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/s390utils-2.34.0-fedora.patch b/s390utils-2.34.0-fedora.patch index e69de29..5785622 100644 --- a/s390utils-2.34.0-fedora.patch +++ b/s390utils-2.34.0-fedora.patch @@ -0,0 +1,55 @@ +From 54e9e22cc0fb54a954e8b6b700402af934135fc7 Mon Sep 17 00:00:00 2001 +From: Steffen Eiden +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 +Signed-off-by: Steffen Eiden +(cherry picked from commit 6a55d0c2e57952600164822dd100e8247b4b010f) +--- + 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 9a64761..1084f8e 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 1356c1b..b617b8f 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, +-- +2.46.0 + diff --git a/s390utils.spec b/s390utils.spec index 6bf2935..e6cb28e 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.34.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -47,7 +47,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -#Patch100: s390utils-%%{version}-fedora.patch +Patch100: s390utils-%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -1067,6 +1067,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Mon Aug 26 2024 Dan Horák - 2:2.34.0-2 +- don't make Rust warnings fatal + * Mon Aug 12 2024 Dan Horák - 2:2.34.0-1 - rebased to 2.34.0 (rhbz#2302462) From d55343afd6d9aaffbffad6d6a61755cf067c8ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 3 Oct 2024 09:12:25 +0000 Subject: [PATCH 05/29] - rebased to 2.35.0 (rhbz#2316232) --- s390utils-2.34.0-fedora.patch | 55 ----------------------------------- s390utils-2.35.0-fedora.patch | 0 s390utils.spec | 11 +++---- sources | 4 +-- 4 files changed, 8 insertions(+), 62 deletions(-) delete mode 100644 s390utils-2.34.0-fedora.patch create mode 100644 s390utils-2.35.0-fedora.patch diff --git a/s390utils-2.34.0-fedora.patch b/s390utils-2.34.0-fedora.patch deleted file mode 100644 index 5785622..0000000 --- a/s390utils-2.34.0-fedora.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 54e9e22cc0fb54a954e8b6b700402af934135fc7 Mon Sep 17 00:00:00 2001 -From: Steffen Eiden -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 -Signed-off-by: Steffen Eiden -(cherry picked from commit 6a55d0c2e57952600164822dd100e8247b4b010f) ---- - 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 9a64761..1084f8e 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 1356c1b..b617b8f 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, --- -2.46.0 - diff --git a/s390utils-2.35.0-fedora.patch b/s390utils-2.35.0-fedora.patch new file mode 100644 index 0000000..e69de29 diff --git a/s390utils.spec b/s390utils.spec index e6cb28e..8878c75 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -13,8 +13,8 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.34.0 -Release: 2%{?dist} +Version: 2.35.0 +Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -47,7 +47,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -Patch100: s390utils-%{version}-fedora.patch +#Patch100: s390utils-%%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -248,12 +248,10 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf %license rust/cargo-vendor.txt %endif %{_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* @@ -1067,6 +1065,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Thu Oct 03 2024 Dan Horák - 2:2.35.0-1 +- rebased to 2.35.0 (rhbz#2316232) + * Mon Aug 26 2024 Dan Horák - 2:2.34.0-2 - don't make Rust warnings fatal diff --git a/sources b/sources index 414897d..aa65d49 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.34.0.tar.gz) = 1ae9bc5e14efe818570227b326f6572fedb99afd9ffd68af649a1d736d9b963a068dd878bcea21b23b9368414c32a5d98aa2ea0aa7a260a9267d6331983dfcf8 -SHA512 (s390-tools-2.34.0-rust-vendor.tar.xz) = 77543e418cdac7628c0ddf562473b5fdd104679be572ed62b461dc2dd896a2f60c9f4aa366e9dd5c59ece09c6387ca52782c0f23f3e6b76adfc85c233b36351a +SHA512 (s390-tools-2.35.0.tar.gz) = 1ee6e7dc5a0c504bb23bde00e5e6a2ed333e7712677056075caf68a02eb222cd9c00d16fcf17e0a7c9f89609901d343b55953b0036c0d2cab35830ea8eb53fea +SHA512 (s390-tools-2.35.0-rust-vendor.tar.xz) = 116adeac121c56d7d5bc37b3a7972a78e1ce86fd53f919d293d4bfe92999449ce6f30a592fdb3f4d48fda64817c9b19587a038bf832c7b745a715b9b469e1ee4 From 865e5c3bac85937a17386e130262d987d4560c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 13 Jan 2025 20:42:27 +0000 Subject: [PATCH 06/29] Build against rust-thiserror1-devel --- s390utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 8878c75..80609a9 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -104,7 +104,7 @@ BuildRequires: crate(serde_test) BuildRequires: crate(serde_yaml) BuildRequires: crate(strsim) BuildRequires: crate(terminal_size) -BuildRequires: crate(thiserror) +BuildRequires: crate(thiserror) < 2 BuildRequires: crate(zerocopy) BuildRequires: rust-packaging %endif From a0ae4f8f73b7a72563a6db43702902bc93c5582d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 14 Jan 2025 14:08:22 +0000 Subject: [PATCH 07/29] switch to %make_install --- s390utils.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index 80609a9..83e481c 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -152,12 +152,11 @@ popd %install -make install \ +%make_install \ HAVE_DRACUT=1 \ %if %{with pandoc} ENABLE_DOC=1 \ %endif - DESTDIR=%{buildroot} \ BINDIR=/usr/sbin \ SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ DISTRELEASE=%{release} \ From c0f10fd579e42197575d5773d98da89a0ff22f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 14 Jan 2025 14:43:02 +0000 Subject: [PATCH 08/29] don't package scsi_logging_level as it is provided by sg3_utils --- s390utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 83e481c..753d3ac 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -576,7 +576,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm %{_sbindir}/qetharp %{_sbindir}/qethconf %{_sbindir}/qethqoat -%{_sbindir}/scsi_logging_level +%exclude %{_sbindir}/scsi_logging_level %{_sbindir}/sclpdbf %{_sbindir}/start_hsnc.sh %{_sbindir}/tape390_crypt From 2add3e66cd5d988f3a492f86f29c000869b83236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 14 Jan 2025 14:45:36 +0000 Subject: [PATCH 09/29] support merged bin and sbin https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin) --- s390utils.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 753d3ac..dd6e2a7 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.35.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -138,7 +138,12 @@ make \ ENABLE_DOC=1 \ %endif NO_PIE_LDFLAGS="" \ +%if "%{_sbindir}" == "%{_bindir}" + BINDIR=/usr/bin \ + USRSBINDIR=/usr/bin \ +%else BINDIR=/usr/sbin \ +%endif DISTRELEASE=%{release} \ V=1 @@ -157,7 +162,12 @@ popd %if %{with pandoc} ENABLE_DOC=1 \ %endif +%if "%{_sbindir}" == "%{_bindir}" + BINDIR=/usr/bin \ + USRSBINDIR=/usr/bin \ +%else BINDIR=/usr/sbin \ +%endif SYSTEMDSYSTEMUNITDIR=%{_unitdir} \ DISTRELEASE=%{release} \ V=1 @@ -1064,6 +1074,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Tue Jan 14 2025 Dan Horák - 2:2.35.0-2 +- updated for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin + * Thu Oct 03 2024 Dan Horák - 2:2.35.0-1 - rebased to 2.35.0 (rhbz#2316232) From a3da2ffb3c0140673045aecd9c49c5c19f372dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 15 Jan 2025 11:30:13 +0100 Subject: [PATCH 10/29] add sysusers.d config For https://pagure.io/releng/failed-composes/issue/7714#comment-951273. --- s390utils.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index dd6e2a7..242cda8 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.35.0 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -130,6 +130,11 @@ popd %endif rm ./rust/Cargo.lock +# Create sysusers config files +echo 'g zkeyadm' >s390utils-base.conf +echo 'g ts-shell' >s390utils-iucvterm.conf +echo 'g cpacfstats' >s390utils-cpacfstatsd.conf + %build make \ CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \ @@ -235,6 +240,9 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules # zipl.conf to be ghosted touch %{buildroot}%{_sysconfdir}/zipl.conf + +install -Dt %{buildroot}%{_sysusersdir}/ s390utils-{base,iucvterm,cpacfstatsd}.conf + %endif %ifarch s390x @@ -615,6 +623,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm %ghost %config(noreplace) %{_sysconfdir}/zipl.conf %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf %{_sysconfdir}/mdevctl.d/* +%{_sysusersdir}/s390utils-base.conf /usr/lib/dracut/modules.d/99ngdump/ # own the mdevctl dirs until new release is available %dir /usr/lib/mdevctl @@ -901,6 +910,7 @@ fi %{_bindir}/ts-shell %{_sbindir}/chiucvallow %{_sbindir}/lsiucvallow +%{_sysusersdir}/s390utils-iucvterm.conf %dir %attr(2770,root,ts-shell) /var/log/ts-shell %doc iucvterm/doc/ts-shell %{_mandir}/man1/iucvconn.1* @@ -1004,6 +1014,7 @@ getent group cpacfstats >/dev/null || groupadd -r cpacfstats %{_mandir}/man1/cpacfstats.1* %{_mandir}/man8/cpacfstatsd.8* %{_unitdir}/cpacfstatsd.service +%{_sysusersdir}/s390utils-cpacfstatsd.conf # # *********************** chreipl-fcp-mpath package *********************** @@ -1074,6 +1085,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Wed Jan 15 2025 Zbigniew Jedrzejewski-Szmek - 2:2.35.0-3 +- Add sysusers.d config + * Tue Jan 14 2025 Dan Horák - 2:2.35.0-2 - updated for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin From 9886d22bc2f4af942f60627b6345779d6194d4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 20 Jan 2025 19:08:37 +0100 Subject: [PATCH 11/29] - fix build with gcc15 - Resolves: rhbz#2338176 --- s390utils-2.35.0-gcc15-zipl.patch | 33 +++++++++++++++++++++++++++++++ s390utils.spec | 10 +++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 s390utils-2.35.0-gcc15-zipl.patch diff --git a/s390utils-2.35.0-gcc15-zipl.patch b/s390utils-2.35.0-gcc15-zipl.patch new file mode 100644 index 0000000..ba4e9cc --- /dev/null +++ b/s390utils-2.35.0-gcc15-zipl.patch @@ -0,0 +1,33 @@ +From 2afcc33c90f142bfa2fd348fdf27778e23e32c6e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Thu, 16 Jan 2025 14:32:52 +0000 +Subject: [PATCH] zipl: Update inline assembly for GCC 15 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Properly escape % (as %%) for extended assembly in stage3.c in start_kernel(). + +Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/179 +Signed-off-by: Dan Horák +--- + zipl/boot/stage3.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/zipl/boot/stage3.c b/zipl/boot/stage3.c +index 82b7b2ad..76275f65 100644 +--- a/zipl/boot/stage3.c ++++ b/zipl/boot/stage3.c +@@ -48,9 +48,9 @@ static inline void __noreturn start_kernel(void) + " diag %[code],%[code],0x308\n" + ".no_diag308:\n" + " sam31\n" +- " sr %r1,%r1\n" +- " sr %r2,%r2\n" +- " sigp %r1,%r2,%[order]\n" ++ " sr %%r1,%%r1\n" ++ " sr %%r2,%%r2\n" ++ " sigp %%r1,%%r2,%[order]\n" + " lpsw 0\n" + : [addr] "=&d" (addr), + [code] "+&d" (code) diff --git a/s390utils.spec b/s390utils.spec index 242cda8..b8d3753 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.35.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -46,6 +46,10 @@ Source25: 91-zipl.install Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch +# build fix +# https://github.com/ibm-s390-linux/s390-tools/pull/180 +Patch99: s390utils-%{version}-gcc15-zipl.patch + # upstream fixes/updates #Patch100: s390utils-%%{version}-fedora.patch @@ -1085,6 +1089,10 @@ User-space development files for the s390/s390x architecture. %changelog +* Mon Jan 20 2025 Dan Horák - 2:2.35.0-4 +- fix build with gcc15 +- Resolves: rhbz#2338176 + * Wed Jan 15 2025 Zbigniew Jedrzejewski-Szmek - 2:2.35.0-3 - Add sysusers.d config From 7b6090d409d07e4851b38e28ec2f946cdde0b52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 20 Jan 2025 22:10:31 +0100 Subject: [PATCH 12/29] update for merged bin and sbin --- rpminspect.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpminspect.yaml b/rpminspect.yaml index 9d4a1bf..7e19000 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -5,5 +5,5 @@ pathmigration: badfuncs: allowed: - /usr/sbin/qethqoat: + /usr/bin/qethqoat: - inet_ntoa From 008037d366ddd2558eb493f1eb1c7d2aadd7bc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 4 Feb 2025 18:59:34 +0100 Subject: [PATCH 13/29] finish migration to sysusers.d by removing the now redundant %pre scriptlets --- s390utils.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index b8d3753..f78d7a0 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -547,10 +547,6 @@ For more information refer to the following publications: * "Device Drivers, Features, and Commands" chapter "Useful Linux commands" * "Using the dump tools" -%pre base -# check for zkeyadm group and create it -getent group zkeyadm > /dev/null || groupadd -r zkeyadm - %post base %systemd_post dumpconf.service @@ -885,10 +881,6 @@ active TCP/IP connection between two Linux guest operating systems. - ts-shell: Terminal server shell to authorize and control IUCV terminal connections for individual Linux users. -%pre iucvterm -# check for ts-shell group and create it -getent group ts-shell > /dev/null || groupadd -r ts-shell - %post iucvterm # /etc/shells is provided by "setup" grep -q '^/usr/bin/ts-shell$' /etc/shells \ @@ -1009,9 +1001,6 @@ and maintain CPACF activity counters. %postun cpacfstatsd %systemd_postun_with_restart cpacfstatsd.service -%pre cpacfstatsd -getent group cpacfstats >/dev/null || groupadd -r cpacfstats - %files cpacfstatsd %{_bindir}/cpacfstats %{_sbindir}/cpacfstatsd From ffe5dc6c52ded79afd050720ee368c5388ba647c Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 6 Feb 2025 13:47:34 +0100 Subject: [PATCH 14/29] Rebuild for openssl crate >= v0.10.70 (RUSTSEC-2025-0004) --- s390utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index f78d7a0..81903f1 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.35.0 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -1078,6 +1078,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Thu Feb 06 2025 Fabio Valentini - 2:2.35.0-5 +- Rebuild for openssl crate >= v0.10.70 (RUSTSEC-2025-0004) + * Mon Jan 20 2025 Dan Horák - 2:2.35.0-4 - fix build with gcc15 - Resolves: rhbz#2338176 From a41e967ae024c6c75e78a3fc7d7a3eeb11de0032 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 6 Feb 2025 15:16:14 +0100 Subject: [PATCH 15/29] Rebuild for openssl crate >= v0.10.70 (RUSTSEC-2025-0004) --- s390utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 3fc3870..ec872d8 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -14,7 +14,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.33.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -1067,6 +1067,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Thu Feb 06 2025 Fabio Valentini - 2:2.33.1-4 +- Rebuild for openssl crate >= v0.10.70 (RUSTSEC-2025-0004) + * Mon Jul 15 2024 Dan Horák - 2:2.33.1-3 - "which" is not required any more - Revert "zipl/src: Fix problems when target parameters are specified by user" From 78e514453feb415d9f32803efd6d6ead91edb867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 13 Jan 2025 20:42:27 +0000 Subject: [PATCH 16/29] Build against rust-thiserror1-devel --- s390utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index ec872d8..b63fcd3 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -104,7 +104,7 @@ BuildRequires: crate(serde_test) BuildRequires: crate(serde_yaml) BuildRequires: crate(strsim) BuildRequires: crate(terminal_size) -BuildRequires: crate(thiserror) +BuildRequires: crate(thiserror) < 2 BuildRequires: crate(zerocopy) BuildRequires: rust-packaging %endif From 3484222eb4bd12cf930486c17931808ea885dcdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 6 Feb 2025 14:53:09 +0000 Subject: [PATCH 17/29] use systemd-tmpfiles for /var/log/ts-shell Also generalize the systemd-sysusers and systemd-tmpfiles support. --- s390utils.spec | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index 81903f1..ea6072f 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -135,9 +135,12 @@ popd rm ./rust/Cargo.lock # Create sysusers config files -echo 'g zkeyadm' >s390utils-base.conf -echo 'g ts-shell' >s390utils-iucvterm.conf -echo 'g cpacfstats' >s390utils-cpacfstatsd.conf +echo 'g zkeyadm' > s390utils-base.conf.usr +echo 'g ts-shell' > s390utils-iucvterm.conf.usr +echo 'g cpacfstats' > s390utils-cpacfstatsd.conf.usr + +# Create tmpfiles config files +echo 'd /var/log/ts-shell 2770 root ts-shell' > s390utils-iucvterm.conf.tmp %build make \ @@ -245,7 +248,14 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules # zipl.conf to be ghosted touch %{buildroot}%{_sysconfdir}/zipl.conf -install -Dt %{buildroot}%{_sysusersdir}/ s390utils-{base,iucvterm,cpacfstatsd}.conf +# install systemd sysusers and tmpfiles +mkdir -p %{buildroot}{%{_sysusersdir},%{_tmpfilesdir}}/ +for f in s390utils-*.conf.usr; do + install -p $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f) +done +for f in s390utils-*.conf.tmp; do + install -p $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f) +done %endif @@ -907,7 +917,8 @@ fi %{_sbindir}/chiucvallow %{_sbindir}/lsiucvallow %{_sysusersdir}/s390utils-iucvterm.conf -%dir %attr(2770,root,ts-shell) /var/log/ts-shell +%{_tmpfilesdir}/s390utils-iucvterm.conf +%ghost %dir %attr(2770,root,ts-shell) /var/log/ts-shell %doc iucvterm/doc/ts-shell %{_mandir}/man1/iucvconn.1* %{_mandir}/man1/iucvtty.1* From 8cf2e7926d3fd4fc09be0a3d8e06dcba04334d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 14 Jan 2025 12:53:46 +0000 Subject: [PATCH 18/29] - rebased to 2.36.0 (rhbz#2330787) --- s390utils-2.35.0-fedora.patch | 0 s390utils-2.36.0-fedora.patch | 16 ++++++++++++++++ s390utils.spec | 33 +++++++++++++++++++++++++++------ sources | 4 ++-- 4 files changed, 45 insertions(+), 8 deletions(-) delete mode 100644 s390utils-2.35.0-fedora.patch create mode 100644 s390utils-2.36.0-fedora.patch diff --git a/s390utils-2.35.0-fedora.patch b/s390utils-2.35.0-fedora.patch deleted file mode 100644 index e69de29..0000000 diff --git a/s390utils-2.36.0-fedora.patch b/s390utils-2.36.0-fedora.patch new file mode 100644 index 0000000..4a20bb7 --- /dev/null +++ b/s390utils-2.36.0-fedora.patch @@ -0,0 +1,16 @@ +diff --git a/zipl/src/Makefile b/zipl/src/Makefile +index 7927974..e9f68b4 100644 +--- a/zipl/src/Makefile ++++ b/zipl/src/Makefile +@@ -38,9 +38,8 @@ install: all + $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) + $(INSTALL) -c zipl $(DESTDIR)$(BINDIR) + $(INSTALL) -c zipl-editenv $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(zipl_helpers) $(chreipl_helpers) \ +- $(DESTDIR)$(TOOLS_LIBDIR) +- $(CP) --no-dereference $(chreipl_helpers) $(DESTDIR)$(TOOLS_LIBDIR) ++ $(CP) --no-dereference $(zipl_helpers) $(chreipl_helpers) \ ++ $(DESTDIR)$(TOOLS_LIBDIR) + + clean: + rm -f *.o $(zipl_helpers) $(chreipl_helpers) zipl zipl-editenv diff --git a/s390utils.spec b/s390utils.spec index ea6072f..7384627 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -13,8 +13,8 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.35.0 -Release: 5%{?dist} +Version: 2.36.0 +Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -48,7 +48,7 @@ Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # build fix # https://github.com/ibm-s390-linux/s390-tools/pull/180 -Patch99: s390utils-%{version}-gcc15-zipl.patch +Patch99: s390utils-2.35.0-gcc15-zipl.patch # upstream fixes/updates #Patch100: s390utils-%%{version}-fedora.patch @@ -124,7 +124,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers. %prep %autosetup -n s390-tools-%{version} -p1 -%if 0%{?rhel} +%if 1%{?rhel} pushd rust tar xf %{SOURCE1} %cargo_prep -v vendor @@ -281,12 +281,18 @@ done %{_bindir}/genprotimg %{_bindir}/pvattest %{_bindir}/pvextract-hdr +%{_bindir}/pvimg %{_bindir}/pvsecret %{_mandir}/man1/genprotimg.1* %{_mandir}/man1/pvattest.1* +%{_mandir}/man1/pvattest-check.1* %{_mandir}/man1/pvattest-create.1* %{_mandir}/man1/pvattest-perform.1* %{_mandir}/man1/pvattest-verify.1* +%{_mandir}/man1/pvimg.1* +%{_mandir}/man1/pvimg-create.1* +%{_mandir}/man1/pvimg-info.1* +%{_mandir}/man1/pvimg-test.1* %{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-meta.1* @@ -296,7 +302,7 @@ done %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* %dir %{_datadir}/s390-tools -%{_datadir}/s390-tools/genprotimg/ +%{_datadir}/s390-tools/pvimg/ # # enf of multi-arch section @@ -426,6 +432,7 @@ BuildRequires: cryptsetup-devel >= 2.0.3 BuildRequires: json-c-devel BuildRequires: rpm-devel BuildRequires: libxml2-devel +BuildRequires: libnl3-devel %description base @@ -600,6 +607,7 @@ For more information refer to the following publications: %{_sbindir}/lstape %{_sbindir}/lszcrypt %{_sbindir}/lszfcp +%{_sbindir}/opticsmon %{_sbindir}/pai %{_sbindir}/qetharp %{_sbindir}/qethconf @@ -620,9 +628,11 @@ For more information refer to the following publications: %{_sbindir}/zipl-switch-to-blscfg %{_sbindir}/znetconf %{_sbindir}/zpcictl +%{_bindir}/cpacfinfo %{_bindir}/dump2tar %{_bindir}/genprotimg %{_bindir}/pvapconfig +%{_bindir}/pvimg %{_bindir}/mk-s390image %{_bindir}/pvattest %{_bindir}/pvextract-hdr @@ -630,6 +640,7 @@ For more information refer to the following publications: %{_bindir}/zkey %{_bindir}/zkey-cryptsetup %{_unitdir}/dumpconf.service +%{_unitdir}/opticsmon.service %ghost %config(noreplace) %{_sysconfdir}/zipl.conf %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf %{_sysconfdir}/mdevctl.d/* @@ -650,13 +661,19 @@ For more information refer to the following publications: %dir %{_libdir}/zkey %{_libdir}/zkey/zkey-ekmfweb.so %{_libdir}/zkey/zkey-kmip.so +%{_mandir}/man1/cpacfinfo.1* %{_mandir}/man1/dump2tar.1* %{_mandir}/man1/genprotimg.1* %{_mandir}/man1/pvapconfig.1* %{_mandir}/man1/pvattest.1* +%{_mandir}/man1/pvattest-check.1* %{_mandir}/man1/pvattest-create.1* %{_mandir}/man1/pvattest-perform.1* %{_mandir}/man1/pvattest-verify.1* +%{_mandir}/man1/pvimg.1* +%{_mandir}/man1/pvimg-create.1* +%{_mandir}/man1/pvimg-info.1* +%{_mandir}/man1/pvimg-test.1* %{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-meta.1* @@ -699,6 +716,7 @@ For more information refer to the following publications: %{_mandir}/man8/lstape.8* %{_mandir}/man8/lszcrypt.8* %{_mandir}/man8/lszfcp.8* +%{_mandir}/man8/opticsmon.8* %{_mandir}/man8/pai.8* %{_mandir}/man8/qetharp.8* %{_mandir}/man8/qethconf.8* @@ -738,7 +756,7 @@ BuildArch: noarch %files se-data %dir %{_datadir}/s390-tools -%{_datadir}/s390-tools/genprotimg/ +%{_datadir}/s390-tools/pvimg/ # # *********************** s390-tools osasnmpd package *********************** @@ -1089,6 +1107,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Mon Feb 24 2025 Dan Horák - 2:2.36.0-1 +- rebased to 2.36.0 (rhbz#2330787) + * Thu Feb 06 2025 Fabio Valentini - 2:2.35.0-5 - Rebuild for openssl crate >= v0.10.70 (RUSTSEC-2025-0004) diff --git a/sources b/sources index aa65d49..444acfa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.35.0.tar.gz) = 1ee6e7dc5a0c504bb23bde00e5e6a2ed333e7712677056075caf68a02eb222cd9c00d16fcf17e0a7c9f89609901d343b55953b0036c0d2cab35830ea8eb53fea -SHA512 (s390-tools-2.35.0-rust-vendor.tar.xz) = 116adeac121c56d7d5bc37b3a7972a78e1ce86fd53f919d293d4bfe92999449ce6f30a592fdb3f4d48fda64817c9b19587a038bf832c7b745a715b9b469e1ee4 +SHA512 (s390-tools-2.36.0.tar.gz) = 5704dcbfc88972ff74b5d81acf549e719b90f2ce60b66ca6935c16c0b266ca6728adca72133aa51e1a5acfbabfd6f121b7f9b5023be498c5a203217adc4f5c46 +SHA512 (s390-tools-2.36.0-rust-vendor.tar.xz) = 2e4f53b64e71307e79a3a433c7bd2a6304b0c4e6e34cb84c57e459e86ec25c14b64eab870f0081f2f31d5b8003b071e8f45cf639111a1e759f0dfa070a96d765 From 488af3d803cd13c564c3541b3a1fb12db0403281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Thu, 27 Feb 2025 10:01:38 +0100 Subject: [PATCH 19/29] rebased to 2.37.0 (rhbz#2330787) --- s390utils-2.35.0-gcc15-zipl.patch | 33 ------------------------------- s390utils.spec | 13 +++++++----- sources | 4 ++-- 3 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 s390utils-2.35.0-gcc15-zipl.patch diff --git a/s390utils-2.35.0-gcc15-zipl.patch b/s390utils-2.35.0-gcc15-zipl.patch deleted file mode 100644 index ba4e9cc..0000000 --- a/s390utils-2.35.0-gcc15-zipl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2afcc33c90f142bfa2fd348fdf27778e23e32c6e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Thu, 16 Jan 2025 14:32:52 +0000 -Subject: [PATCH] zipl: Update inline assembly for GCC 15 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Properly escape % (as %%) for extended assembly in stage3.c in start_kernel(). - -Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/179 -Signed-off-by: Dan Horák ---- - zipl/boot/stage3.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/zipl/boot/stage3.c b/zipl/boot/stage3.c -index 82b7b2ad..76275f65 100644 ---- a/zipl/boot/stage3.c -+++ b/zipl/boot/stage3.c -@@ -48,9 +48,9 @@ static inline void __noreturn start_kernel(void) - " diag %[code],%[code],0x308\n" - ".no_diag308:\n" - " sam31\n" -- " sr %r1,%r1\n" -- " sr %r2,%r2\n" -- " sigp %r1,%r2,%[order]\n" -+ " sr %%r1,%%r1\n" -+ " sr %%r2,%%r2\n" -+ " sigp %%r1,%%r2,%[order]\n" - " lpsw 0\n" - : [addr] "=&d" (addr), - [code] "+&d" (code) diff --git a/s390utils.spec b/s390utils.spec index 7384627..f3e56be 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -13,7 +13,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.36.0 +Version: 2.37.0 Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files @@ -46,10 +46,6 @@ Source25: 91-zipl.install Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch -# build fix -# https://github.com/ibm-s390-linux/s390-tools/pull/180 -Patch99: s390utils-2.35.0-gcc15-zipl.patch - # upstream fixes/updates #Patch100: s390utils-%%{version}-fedora.patch @@ -296,9 +292,11 @@ done %{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-meta.1* +%{_mandir}/man1/pvsecret-create-retrievable.1* %{_mandir}/man1/pvsecret-create.1* %{_mandir}/man1/pvsecret-list.1* %{_mandir}/man1/pvsecret-lock.1* +%{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* %dir %{_datadir}/s390-tools @@ -677,9 +675,11 @@ For more information refer to the following publications: %{_mandir}/man1/pvsecret-add.1* %{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-meta.1* +%{_mandir}/man1/pvsecret-create-retrievable.1* %{_mandir}/man1/pvsecret-create.1* %{_mandir}/man1/pvsecret-list.1* %{_mandir}/man1/pvsecret-lock.1* +%{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* %{_mandir}/man1/zkey.1* @@ -1107,6 +1107,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Thu Feb 27 2025 Jakub Čajka - 2:2.37.0-1 +- rebased to 2.37.0 (rhbz#2330787) + * Mon Feb 24 2025 Dan Horák - 2:2.36.0-1 - rebased to 2.36.0 (rhbz#2330787) diff --git a/sources b/sources index 444acfa..44ec9c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.36.0.tar.gz) = 5704dcbfc88972ff74b5d81acf549e719b90f2ce60b66ca6935c16c0b266ca6728adca72133aa51e1a5acfbabfd6f121b7f9b5023be498c5a203217adc4f5c46 -SHA512 (s390-tools-2.36.0-rust-vendor.tar.xz) = 2e4f53b64e71307e79a3a433c7bd2a6304b0c4e6e34cb84c57e459e86ec25c14b64eab870f0081f2f31d5b8003b071e8f45cf639111a1e759f0dfa070a96d765 +SHA512 (s390-tools-2.37.0.tar.gz) = 3577d25bc0a0f2c86912327b4fc844c9ce16ce978c39aa8dbde0e082a0657066bb4cafcb75b5b022a75138afb6e0efe904f62ed3a53bc8f61a9093119b3b95f7 +SHA512 (s390-tools-2.37.0-rust-vendor.tar.xz) = 86ae3311fc5ef5e2274c8fe1553c3caea671875e77ef0d197512fe346f644f46a56c8de5589e040b83480b37765319ef9bd4ad6fda3dc5ecebac8c3e7aa578b0 From ee43d0c73bd34a448b7c740600c0a516df54d273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Thu, 27 Feb 2025 10:05:11 +0100 Subject: [PATCH 20/29] Debundle rust dependencies --- s390utils.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index f3e56be..f9e8572 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -24,7 +24,9 @@ Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version} # tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust ; \ # rm -f Cargo.lock && cargo vendor && \ # tar Jvcf ../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd +%if 0%{?rhel} Source1: s390-tools-%{version}-rust-vendor.tar.xz +%endif Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh Source7: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev Source12: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev @@ -84,6 +86,9 @@ BuildRequires: rust-toolset BuildRequires: crate(anstream) BuildRequires: crate(anstyle-query) BuildRequires: crate(anyhow) +BuildRequires: crate(base64) +BuildRequires: crate(bit-set) +BuildRequires: crate(bitvec) BuildRequires: crate(byteorder) BuildRequires: crate(cfg-if) BuildRequires: crate(clap) @@ -91,6 +96,8 @@ BuildRequires: crate(clap_complete) BuildRequires: crate(clap_derive) BuildRequires: crate(colorchoice) BuildRequires: crate(curl) +BuildRequires: crate(deku) +BuildRequires: crate(enum_dispatch) BuildRequires: crate(is-terminal) BuildRequires: crate(lazy_static) BuildRequires: crate(libc) @@ -98,13 +105,17 @@ BuildRequires: crate(log) BuildRequires: crate(mockito) BuildRequires: crate(openssl) BuildRequires: crate(openssl-probe) +BuildRequires: crate(proc-macro-crate) +BuildRequires: crate(proptest) +BuildRequires: crate(rusty-fork) 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) < 2 +BuildRequires: crate(thiserror) +BuildRequires: crate(wait-timeout) BuildRequires: crate(zerocopy) BuildRequires: rust-packaging %endif @@ -120,7 +131,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers. %prep %autosetup -n s390-tools-%{version} -p1 -%if 1%{?rhel} +%if 0%{?rhel} pushd rust tar xf %{SOURCE1} %cargo_prep -v vendor From 745b0f7706a898bbf67e2c396289b11a7b6621aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 28 Feb 2025 18:33:21 +0100 Subject: [PATCH 21/29] update fedora patch filename --- s390utils-2.36.0-fedora.patch => s390utils-2.37.0-fedora.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename s390utils-2.36.0-fedora.patch => s390utils-2.37.0-fedora.patch (100%) diff --git a/s390utils-2.36.0-fedora.patch b/s390utils-2.37.0-fedora.patch similarity index 100% rename from s390utils-2.36.0-fedora.patch rename to s390utils-2.37.0-fedora.patch From 7efda8631f0328d746e605006ad4f8a336df5b72 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 13 Mar 2025 11:17:20 -0400 Subject: [PATCH 22/29] Properly generate Rust BuildRequires on Fedora --- s390utils.spec | 51 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index f9e8572..36f03f1 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -11,10 +11,13 @@ %bcond_with pandoc %endif +# Also controls whether %%cargo_generate_buildrequires generates dev-dependencies +%bcond_without check + Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.37.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files License: MIT AND LGPL-2.1-or-later @@ -83,41 +86,7 @@ BuildRequires: libcurl-devel BuildRequires: openssl-devel BuildRequires: rust-toolset %else -BuildRequires: crate(anstream) -BuildRequires: crate(anstyle-query) -BuildRequires: crate(anyhow) -BuildRequires: crate(base64) -BuildRequires: crate(bit-set) -BuildRequires: crate(bitvec) -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(deku) -BuildRequires: crate(enum_dispatch) -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(proc-macro-crate) -BuildRequires: crate(proptest) -BuildRequires: crate(rusty-fork) -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(wait-timeout) -BuildRequires: crate(zerocopy) -BuildRequires: rust-packaging +BuildRequires: cargo-rpm-macros >= 24 %endif %description @@ -149,6 +118,13 @@ echo 'g cpacfstats' > s390utils-cpacfstatsd.conf.usr # Create tmpfiles config files echo 'd /var/log/ts-shell 2770 root ts-shell' > s390utils-iucvterm.conf.tmp +%if !0%{?rhel} +%generate_buildrequires +pushd rust >/dev/null +%cargo_generate_buildrequires +popd >/dev/null +%endif + %build make \ CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \ @@ -1118,6 +1094,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Thu Mar 13 2025 Benjamin A. Beasley - 2:2.37.0-2 +- Properly generate Rust BuildRequires on Fedora + * Thu Feb 27 2025 Jakub Čajka - 2:2.37.0-1 - rebased to 2.37.0 (rhbz#2330787) From 43b62453bdbb43b7ea0d76a4db5ddbe19feb249d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 13 Mar 2025 13:08:31 -0400 Subject: [PATCH 23/29] Update License (for s390utils/s390utils-base) to reflect Rust deps. --- s390utils.spec | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index 36f03f1..4494d69 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -19,8 +19,30 @@ Summary: Utilities and daemons for IBM z Systems Version: 2.37.0 Release: 2%{?dist} Epoch: 2 -# MIT covers nearly all the files, except init files -License: MIT AND LGPL-2.1-or-later +# MIT covers nearly all the files, except init files (LGPL-2.1-or-later) +# +# Statically-linked Rust dependencies contribute additional license terms, +# listed in the output of %%{cargo_license_summary}: +# +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause OR Apache-2.0 OR MIT +# MIT +# MIT OR Apache-2.0 +# Unlicense OR MIT +%global extra_licenses_from_rust_deps %{shrink: +Apache-2.0 AND +(Apache-2.0 OR BSL-1.0) AND +(Apache-2.0 OR MIT) AND +(Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND +(BSD-2-Clause OR Apache-2.0 OR MIT) AND +Unicode-DFS-2016 AND +(Unlicense OR MIT) +} +License: MIT AND LGPL-2.1-or-later AND %{extra_licenses_from_rust_deps} URL: https://github.com/ibm-s390-linux/s390-tools Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz # To create the vendor tarball: @@ -397,7 +419,7 @@ This package provides minimal set of tools needed to system to boot. # %package base -License: MIT AND LGPL-2.1-or-later +License: MIT AND LGPL-2.1-or-later AND %{extra_licenses_from_rust_deps} Summary: S390 base tools Provides: s390-tools-base = %{epoch}:%{version}-%{release} Requires: coreutils @@ -1096,6 +1118,7 @@ User-space development files for the s390/s390x architecture. %changelog * Thu Mar 13 2025 Benjamin A. Beasley - 2:2.37.0-2 - Properly generate Rust BuildRequires on Fedora +- Update License (for s390utils/s390utils-base) to reflect Rust deps. * Thu Feb 27 2025 Jakub Čajka - 2:2.37.0-1 - rebased to 2.37.0 (rhbz#2330787) From f7557efaba2054d61a919c4317009a01e6775d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 27 Jun 2025 11:57:38 +0000 Subject: [PATCH 24/29] - rebased to 2.38.0 (rhbz#2374765) --- s390utils-2.37.0-fedora.patch | 16 ---------------- s390utils-2.38.0-fedora.patch | 0 s390utils.spec | 23 +++++++++++++++++------ sources | 4 ++-- 4 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 s390utils-2.37.0-fedora.patch create mode 100644 s390utils-2.38.0-fedora.patch diff --git a/s390utils-2.37.0-fedora.patch b/s390utils-2.37.0-fedora.patch deleted file mode 100644 index 4a20bb7..0000000 --- a/s390utils-2.37.0-fedora.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/zipl/src/Makefile b/zipl/src/Makefile -index 7927974..e9f68b4 100644 ---- a/zipl/src/Makefile -+++ b/zipl/src/Makefile -@@ -38,9 +38,8 @@ install: all - $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) - $(INSTALL) -c zipl $(DESTDIR)$(BINDIR) - $(INSTALL) -c zipl-editenv $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 755 $(zipl_helpers) $(chreipl_helpers) \ -- $(DESTDIR)$(TOOLS_LIBDIR) -- $(CP) --no-dereference $(chreipl_helpers) $(DESTDIR)$(TOOLS_LIBDIR) -+ $(CP) --no-dereference $(zipl_helpers) $(chreipl_helpers) \ -+ $(DESTDIR)$(TOOLS_LIBDIR) - - clean: - rm -f *.o $(zipl_helpers) $(chreipl_helpers) zipl zipl-editenv diff --git a/s390utils-2.38.0-fedora.patch b/s390utils-2.38.0-fedora.patch new file mode 100644 index 0000000..e69de29 diff --git a/s390utils.spec b/s390utils.spec index 4494d69..2d5c72c 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -16,8 +16,8 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.37.0 -Release: 2%{?dist} +Version: 2.38.0 +Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later) # @@ -302,6 +302,7 @@ done %{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-meta.1* %{_mandir}/man1/pvsecret-create-retrievable.1* +%{_mandir}/man1/pvsecret-create-update-cck.1* %{_mandir}/man1/pvsecret-create.1* %{_mandir}/man1/pvsecret-list.1* %{_mandir}/man1/pvsecret-lock.1* @@ -310,6 +311,8 @@ done %{_mandir}/man1/pvsecret.1* %dir %{_datadir}/s390-tools %{_datadir}/s390-tools/pvimg/ +%{bash_completions_dir}/*.bash +%{zsh_completions_dir}/_* # # enf of multi-arch section @@ -407,6 +410,7 @@ This package provides minimal set of tools needed to system to boot. %{_udevrulesdir}/81-ccw.rules %{_udevrulesdir}/81-dpm.rules %{_udevrulesdir}/90-cpi.rules +%{_udevrulesdir}/80-hotplug-cpu.rules %{_sysconfdir}/kernel/install.d/20-grubby.install %{_prefix}/lib/kernel/install.d/10-zfcpdump.install %{_prefix}/lib/kernel/install.d/20-zipl-kernel.install @@ -517,9 +521,6 @@ s390 base tools. This collection provides the following utilities: feature. Those traces are filtered with the zfcpdbf script, i.e. merge several traces, make it more readable etc. - * scsi_logging_level: - Create, get or set the logging level for the SCSI logging facility. - * zconf: Set of scripts to configure and list status information of Linux for zSeries IO devices. @@ -619,7 +620,6 @@ For more information refer to the following publications: %{_sbindir}/qetharp %{_sbindir}/qethconf %{_sbindir}/qethqoat -%exclude %{_sbindir}/scsi_logging_level %{_sbindir}/sclpdbf %{_sbindir}/start_hsnc.sh %{_sbindir}/tape390_crypt @@ -633,6 +633,7 @@ For more information refer to the following publications: %{_sbindir}/zfcpdbf %{_sbindir}/zgetdump %{_sbindir}/zipl-switch-to-blscfg +%{_sbindir}/zmemtopo %{_sbindir}/znetconf %{_sbindir}/zpcictl %{_bindir}/cpacfinfo @@ -646,6 +647,7 @@ For more information refer to the following publications: %{_bindir}/pvsecret %{_bindir}/zkey %{_bindir}/zkey-cryptsetup +%{_bindir}/zpwr %{_unitdir}/dumpconf.service %{_unitdir}/opticsmon.service %ghost %config(noreplace) %{_sysconfdir}/zipl.conf @@ -653,6 +655,7 @@ For more information refer to the following publications: %{_sysconfdir}/mdevctl.d/* %{_sysusersdir}/s390utils-base.conf /usr/lib/dracut/modules.d/99ngdump/ +/usr/lib/dracut/dracut.conf.d/99-pkey.conf # own the mdevctl dirs until new release is available %dir /usr/lib/mdevctl %dir /usr/lib/mdevctl/scripts.d @@ -685,6 +688,7 @@ For more information refer to the following publications: %{_mandir}/man1/pvsecret-create-association.1* %{_mandir}/man1/pvsecret-create-meta.1* %{_mandir}/man1/pvsecret-create-retrievable.1* +%{_mandir}/man1/pvsecret-create-update-cck.1* %{_mandir}/man1/pvsecret-create.1* %{_mandir}/man1/pvsecret-list.1* %{_mandir}/man1/pvsecret-lock.1* @@ -695,6 +699,7 @@ For more information refer to the following publications: %{_mandir}/man1/zkey-cryptsetup.1* %{_mandir}/man1/zkey-ekmfweb.1* %{_mandir}/man1/zkey-kmip.1* +%{_mandir}/man1/zpwr.1* %{_mandir}/man4/prandom.4* %{_mandir}/man5/hsavmcore.conf.5* %{_mandir}/man8/chccwdev.8* @@ -740,10 +745,13 @@ For more information refer to the following publications: %{_mandir}/man8/zfcpdbf.8* %{_mandir}/man8/zgetdump.8* %{_mandir}/man8/zipl-switch-to-blscfg.8* +%{_mandir}/man8/zmemtopo.8* %{_mandir}/man8/znetconf.8* %{_mandir}/man8/zpcictl.8* %dir %{_datadir}/s390-tools %{_datadir}/s390-tools/netboot/ +%{bash_completions_dir}/*.bash +%{zsh_completions_dir}/_* %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip/profiles @@ -1116,6 +1124,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Fri Jun 27 2025 Dan Horák - 2:2.38.0-1 +- rebased to 2.38.0 (rhbz#2374765) + * Thu Mar 13 2025 Benjamin A. Beasley - 2:2.37.0-2 - Properly generate Rust BuildRequires on Fedora - Update License (for s390utils/s390utils-base) to reflect Rust deps. diff --git a/sources b/sources index 44ec9c0..16b71cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.37.0.tar.gz) = 3577d25bc0a0f2c86912327b4fc844c9ce16ce978c39aa8dbde0e082a0657066bb4cafcb75b5b022a75138afb6e0efe904f62ed3a53bc8f61a9093119b3b95f7 -SHA512 (s390-tools-2.37.0-rust-vendor.tar.xz) = 86ae3311fc5ef5e2274c8fe1553c3caea671875e77ef0d197512fe346f644f46a56c8de5589e040b83480b37765319ef9bd4ad6fda3dc5ecebac8c3e7aa578b0 +SHA512 (s390-tools-2.38.0.tar.gz) = 9ca9393e9deeab5c1df5e9eaa3c12e340917ffd5fe07d9a09087d6488d8e2ec0a136805650830d128595854b818a1da94151003e15954e556ba373b226a7369e +SHA512 (s390-tools-2.38.0-rust-vendor.tar.xz) = c55d2870ad9f90333de2536e7921951185746f0972d5d488bf317b56e754525e4dbd0f63d547229197199b51d41b7032172b6ba7ffacd9a96a01dbd13b9c4d9e From 41042d250b92ce83b1bf43bd2d091f19d4d7225b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 17:51:29 +0000 Subject: [PATCH 25/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- s390utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 2d5c72c..d6235bc 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -17,7 +17,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems Version: 2.38.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later) # @@ -1124,6 +1124,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2:2.38.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jun 27 2025 Dan Horák - 2:2.38.0-1 - rebased to 2.38.0 (rhbz#2374765) From 09f8677bca73d4c361df866a365542a039e37b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 14 Nov 2025 09:14:49 +0000 Subject: [PATCH 26/29] - rebased to 2.39.0 (rhbz#2403755) --- s390utils-2.38.0-fedora.patch | 0 s390utils-2.39.0-fedora.patch | 63 +++++++++++++++++++++++++++++++++++ s390utils.spec | 20 +++++++---- sources | 4 +-- 4 files changed, 79 insertions(+), 8 deletions(-) delete mode 100644 s390utils-2.38.0-fedora.patch create mode 100644 s390utils-2.39.0-fedora.patch diff --git a/s390utils-2.38.0-fedora.patch b/s390utils-2.38.0-fedora.patch deleted file mode 100644 index e69de29..0000000 diff --git a/s390utils-2.39.0-fedora.patch b/s390utils-2.39.0-fedora.patch new file mode 100644 index 0000000..f6f0d44 --- /dev/null +++ b/s390utils-2.39.0-fedora.patch @@ -0,0 +1,63 @@ +From 6bf9a8579cc184e64ab54e08073280ad005d50f6 Mon Sep 17 00:00:00 2001 +From: Peter Jin +Date: Wed, 1 Oct 2025 15:02:10 -0400 +Subject: [PATCH 1/2] udev/rules.d: make virtio-blk devices non-rotational +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Performance measurements turned out that in certain situations the +paging/swap logic turns on the rotational feature for block devices. In the +past, this feature has been disabled for DASD devices. FCP and NVMe devices +are considered non-rotational by default (or exposed by the storage server). +Because those are the backing devices on Linux on Z/LinuxONE instances, +ensure that virtio-blk devices are always non-rotational. + +Signed-off-by: Peter Jin +Signed-off-by: Jan Höppner +(cherry picked from commit 82f8c137e1881577d89309223f6d459361c671dd) +--- + etc/udev/rules.d/59-virtio-blk.rules | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 etc/udev/rules.d/59-virtio-blk.rules + +diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules +new file mode 100644 +index 00000000..2e3c13f7 +--- /dev/null ++++ b/etc/udev/rules.d/59-virtio-blk.rules +@@ -0,0 +1 @@ ++SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" +-- +2.51.1 + + +From 6e854376073b2907301310b1110f1fc6e02f0dc5 Mon Sep 17 00:00:00 2001 +From: Peter Jin +Date: Wed, 1 Oct 2025 15:09:49 -0400 +Subject: [PATCH 2/2] udev/rules.d: Set default io scheduler to 'none' for + virtio-blk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use 'none' as default io scheduler for virtio-blk devices. Performance +improvements for multi-queue setups and to reduce CPU consumption. + +Signed-off-by: Peter Jin +Signed-off-by: Jan Höppner +(cherry picked from commit 6ee5ffef91cb4157079fecb89bf42aa41e81e801) +--- + etc/udev/rules.d/59-virtio-blk.rules | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules +index 2e3c13f7..ca6e1c4d 100644 +--- a/etc/udev/rules.d/59-virtio-blk.rules ++++ b/etc/udev/rules.d/59-virtio-blk.rules +@@ -1 +1,2 @@ + SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" ++SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/scheduler", ATTR{queue/scheduler}="none" +-- +2.51.1 + diff --git a/s390utils.spec b/s390utils.spec index d6235bc..026c593 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -16,8 +16,8 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.38.0 -Release: 2%{?dist} +Version: 2.39.0 +Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later) # @@ -74,7 +74,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -#Patch100: s390utils-%%{version}-fedora.patch +Patch100: s390utils-%%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -207,6 +207,7 @@ fi # move tools to searchable dir mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image %{buildroot}%{_bindir} +mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image.1 %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}{/boot,%{_udevrulesdir},%{_sysconfdir}/{profile.d,sysconfig},%{_prefix}/lib/modules-load.d} install -p -m 644 zipl/boot/tape0.bin %{buildroot}/boot/tape0 @@ -256,10 +257,10 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf # install systemd sysusers and tmpfiles mkdir -p %{buildroot}{%{_sysusersdir},%{_tmpfilesdir}}/ for f in s390utils-*.conf.usr; do - install -p $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f) + install -p -m 644 $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f) done for f in s390utils-*.conf.tmp; do - install -p $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f) + install -p -m 644 $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f) done %endif @@ -331,6 +332,7 @@ License: MIT Summary: S390 core tools Provides: s390-tools-core = %{epoch}:%{version}-%{release} Requires: coreutils +Requires: makedumpfile %{?systemd_requires} # BRs are covered via the base package @@ -406,6 +408,7 @@ This package provides minimal set of tools needed to system to boot. %{_udevrulesdir}/56-dasd.rules %{_udevrulesdir}/56-zfcp.rules %{_udevrulesdir}/59-dasd.rules +%{_udevrulesdir}/59-virtio-blk.rules %{_udevrulesdir}/60-readahead.rules %{_udevrulesdir}/81-ccw.rules %{_udevrulesdir}/81-dpm.rules @@ -639,9 +642,9 @@ For more information refer to the following publications: %{_bindir}/cpacfinfo %{_bindir}/dump2tar %{_bindir}/genprotimg +%{_bindir}/mk-s390image %{_bindir}/pvapconfig %{_bindir}/pvimg -%{_bindir}/mk-s390image %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvsecret @@ -674,6 +677,7 @@ For more information refer to the following publications: %{_mandir}/man1/cpacfinfo.1* %{_mandir}/man1/dump2tar.1* %{_mandir}/man1/genprotimg.1* +%{_mandir}/man1/mk-s390image.1* %{_mandir}/man1/pvapconfig.1* %{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest-check.1* @@ -960,6 +964,7 @@ fi %{_mandir}/man1/ts-shell.1* %{_mandir}/man7/af_iucv.7* %{_mandir}/man8/chiucvallow.8* +%{_mandir}/man8/lsiucvallow.8* %{_mandir}/man9/hvc_iucv.9* %{_unitdir}/iucvtty-login@.service %{_unitdir}/ttyrun-getty@.service @@ -1124,6 +1129,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Thu Nov 13 2025 Dan Horák - 2:2.39.0-1 +- rebased to 2.39.0 (rhbz#2403755) + * Fri Jul 25 2025 Fedora Release Engineering - 2:2.38.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 16b71cb..17deb64 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.38.0.tar.gz) = 9ca9393e9deeab5c1df5e9eaa3c12e340917ffd5fe07d9a09087d6488d8e2ec0a136805650830d128595854b818a1da94151003e15954e556ba373b226a7369e -SHA512 (s390-tools-2.38.0-rust-vendor.tar.xz) = c55d2870ad9f90333de2536e7921951185746f0972d5d488bf317b56e754525e4dbd0f63d547229197199b51d41b7032172b6ba7ffacd9a96a01dbd13b9c4d9e +SHA512 (s390-tools-2.39.0.tar.gz) = ee9447f28f0cc43b4eba8110879174372a4ed85e2e53c3500e02723275c0aee01fd4913558ef3eaa62be40a0f5e634c3eb59587150e809fe14e8b4794e340ac7 +SHA512 (s390-tools-2.39.0-rust-vendor.tar.xz) = eb0cd352e8d3721ba52f79968494e72fc99b5655bbd34c359dfb98d81748a367d87854c799e5d7e88d9fef5209ce0cc5e91286a8259e3fef90e0e53a7b195a20 From 020fb911109c1775c45bf2f59034168197599f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 6 Jan 2026 18:13:01 +0000 Subject: [PATCH 27/29] - rebased to 2.40.0 (rhbz#2421447) --- s390utils.spec | 13 +++++++++++-- sources | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/s390utils.spec b/s390utils.spec index 026c593..6a85b8c 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -16,7 +16,7 @@ Name: s390utils Summary: Utilities and daemons for IBM z Systems -Version: 2.39.0 +Version: 2.40.0 Release: 1%{?dist} Epoch: 2 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later) @@ -74,7 +74,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch # upstream fixes/updates -Patch100: s390utils-%%{version}-fedora.patch +#Patch100: s390utils-%%{version}-fedora.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -288,7 +288,9 @@ done %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvimg +%{_bindir}/pvinfo %{_bindir}/pvsecret +%{_bindir}/pvverify %{_mandir}/man1/genprotimg.1* %{_mandir}/man1/pvattest.1* %{_mandir}/man1/pvattest-check.1* @@ -310,6 +312,7 @@ done %{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* +%{_mandir}/man1/pvverify.1* %dir %{_datadir}/s390-tools %{_datadir}/s390-tools/pvimg/ %{bash_completions_dir}/*.bash @@ -645,9 +648,11 @@ For more information refer to the following publications: %{_bindir}/mk-s390image %{_bindir}/pvapconfig %{_bindir}/pvimg +%{_bindir}/pvinfo %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvsecret +%{_bindir}/pvverify %{_bindir}/zkey %{_bindir}/zkey-cryptsetup %{_bindir}/zpwr @@ -699,6 +704,7 @@ For more information refer to the following publications: %{_mandir}/man1/pvsecret-retrieve.1* %{_mandir}/man1/pvsecret-verify.1* %{_mandir}/man1/pvsecret.1* +%{_mandir}/man1/pvverify.1* %{_mandir}/man1/zkey.1* %{_mandir}/man1/zkey-cryptsetup.1* %{_mandir}/man1/zkey-ekmfweb.1* @@ -1129,6 +1135,9 @@ User-space development files for the s390/s390x architecture. %changelog +* Tue Jan 06 2026 Dan Horák - 2:2.40.0-1 +- rebased to 2.40.0 (rhbz#2421447) + * Thu Nov 13 2025 Dan Horák - 2:2.39.0-1 - rebased to 2.39.0 (rhbz#2403755) diff --git a/sources b/sources index 17deb64..8572938 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (s390-tools-2.39.0.tar.gz) = ee9447f28f0cc43b4eba8110879174372a4ed85e2e53c3500e02723275c0aee01fd4913558ef3eaa62be40a0f5e634c3eb59587150e809fe14e8b4794e340ac7 -SHA512 (s390-tools-2.39.0-rust-vendor.tar.xz) = eb0cd352e8d3721ba52f79968494e72fc99b5655bbd34c359dfb98d81748a367d87854c799e5d7e88d9fef5209ce0cc5e91286a8259e3fef90e0e53a7b195a20 +SHA512 (s390-tools-2.40.0.tar.gz) = 1943429581b280bf9ea370da3700a234d509837cb45b2354cdf79b38db87d2183010d18d9132defd77b9d8e11b7e002c447ffd7c912e20a50da4cb6877758c0e +SHA512 (s390-tools-2.40.0-rust-vendor.tar.xz) = fd1894c4e950a3c51054432731a3aeef4318e794aa4af2dc5fed31da16dce2020f014a64241e44766fb40b0fd6c1ac5943366e38dcfebf264875220ecf1285b5 From 1e19416b2bce1f3042d9ca4f98025fd909007f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 6 Jan 2026 19:31:58 +0100 Subject: [PATCH 28/29] drop outdated patch and add new placeholder one --- s390utils-2.39.0-fedora.patch | 63 ----------------------------------- s390utils-2.40.0-fedora.patch | 0 2 files changed, 63 deletions(-) delete mode 100644 s390utils-2.39.0-fedora.patch create mode 100644 s390utils-2.40.0-fedora.patch diff --git a/s390utils-2.39.0-fedora.patch b/s390utils-2.39.0-fedora.patch deleted file mode 100644 index f6f0d44..0000000 --- a/s390utils-2.39.0-fedora.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 6bf9a8579cc184e64ab54e08073280ad005d50f6 Mon Sep 17 00:00:00 2001 -From: Peter Jin -Date: Wed, 1 Oct 2025 15:02:10 -0400 -Subject: [PATCH 1/2] udev/rules.d: make virtio-blk devices non-rotational -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Performance measurements turned out that in certain situations the -paging/swap logic turns on the rotational feature for block devices. In the -past, this feature has been disabled for DASD devices. FCP and NVMe devices -are considered non-rotational by default (or exposed by the storage server). -Because those are the backing devices on Linux on Z/LinuxONE instances, -ensure that virtio-blk devices are always non-rotational. - -Signed-off-by: Peter Jin -Signed-off-by: Jan Höppner -(cherry picked from commit 82f8c137e1881577d89309223f6d459361c671dd) ---- - etc/udev/rules.d/59-virtio-blk.rules | 1 + - 1 file changed, 1 insertion(+) - create mode 100644 etc/udev/rules.d/59-virtio-blk.rules - -diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules -new file mode 100644 -index 00000000..2e3c13f7 ---- /dev/null -+++ b/etc/udev/rules.d/59-virtio-blk.rules -@@ -0,0 +1 @@ -+SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" --- -2.51.1 - - -From 6e854376073b2907301310b1110f1fc6e02f0dc5 Mon Sep 17 00:00:00 2001 -From: Peter Jin -Date: Wed, 1 Oct 2025 15:09:49 -0400 -Subject: [PATCH 2/2] udev/rules.d: Set default io scheduler to 'none' for - virtio-blk -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use 'none' as default io scheduler for virtio-blk devices. Performance -improvements for multi-queue setups and to reduce CPU consumption. - -Signed-off-by: Peter Jin -Signed-off-by: Jan Höppner -(cherry picked from commit 6ee5ffef91cb4157079fecb89bf42aa41e81e801) ---- - etc/udev/rules.d/59-virtio-blk.rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/etc/udev/rules.d/59-virtio-blk.rules b/etc/udev/rules.d/59-virtio-blk.rules -index 2e3c13f7..ca6e1c4d 100644 ---- a/etc/udev/rules.d/59-virtio-blk.rules -+++ b/etc/udev/rules.d/59-virtio-blk.rules -@@ -1 +1,2 @@ - SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/rotational", ATTR{queue/rotational}="0" -+SUBSYSTEM=="block", ACTION=="add", KERNEL=="vd*[!0-9]", TEST=="queue/scheduler", ATTR{queue/scheduler}="none" --- -2.51.1 - diff --git a/s390utils-2.40.0-fedora.patch b/s390utils-2.40.0-fedora.patch new file mode 100644 index 0000000..e69de29 From 44975e04d93d0818ecac033a2e833404de693091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 6 Jan 2026 19:41:55 +0100 Subject: [PATCH 29/29] update filelist for multi-arch builds --- s390utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/s390utils.spec b/s390utils.spec index 6a85b8c..7da6a02 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -288,7 +288,6 @@ done %{_bindir}/pvattest %{_bindir}/pvextract-hdr %{_bindir}/pvimg -%{_bindir}/pvinfo %{_bindir}/pvsecret %{_bindir}/pvverify %{_mandir}/man1/genprotimg.1* @@ -314,6 +313,7 @@ done %{_mandir}/man1/pvsecret.1* %{_mandir}/man1/pvverify.1* %dir %{_datadir}/s390-tools +%{_datadir}/s390-tools/netboot/ %{_datadir}/s390-tools/pvimg/ %{bash_completions_dir}/*.bash %{zsh_completions_dir}/_*