.gitignore

@@ -1,3 +1,2 @@
-SOURCES/cmsfs-1.1.8c.tar.gz
-SOURCES/s390-tools-2.25.0.tar.gz
-SOURCES/src_vipa-2.1.0.tar.gz
+SOURCES/s390-tools-2.29.0-rust-vendor.tar.xz
+SOURCES/s390-tools-2.29.0.tar.gz

.s390utils.metadata

@@ -1,3 +1,2 @@
-9c9a4e89bddb2b4e6e09ef6fc7c2e6f2ad6316de SOURCES/cmsfs-1.1.8c.tar.gz
-e8e0d3f651179fd14dc4a40d53a1e4ef6edaae7d SOURCES/s390-tools-2.25.0.tar.gz
-8ed8592a0a9370ce8422df9231ccb17f6cf49bed SOURCES/src_vipa-2.1.0.tar.gz
+1dcae3e55c2d4d945d0b5c61a12671468aa5f7ef SOURCES/s390-tools-2.29.0-rust-vendor.tar.xz
+e10ffbde7f3fcf4438fdfdd83051ad68518e7be5 SOURCES/s390-tools-2.29.0.tar.gz

SOURCES/00-zipl-prepare.install

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-COMMAND="$1"
-KERNEL_VERSION="$2"
-BOOT_DIR_ABS="$3"
-KERNEL_IMAGE="$4"
-
-# Remove it, since for zipl the images are always installed in /boot
-rm -rf "${BOOT_DIR_ABS%/*}"

SOURCES/ccw.udev

@@ -1,13 +1,4 @@
-ACTION!="add|change", GOTO="ccw_end"
+ACTION!="add|bind|change", GOTO="ccw_end"
 SUBSYSTEM!="ccw", GOTO="ccw_end"
-ATTRS{cutype}=="1731/01", RUN+="ccw_init"
-ATTRS{cutype}=="1731/02", RUN+="ccw_init"
-ATTRS{cutype}=="1731/05", RUN+="ccw_init"
-ATTRS{cutype}=="1731/06", RUN+="ccw_init"
-ATTRS{cutype}=="3088/01", RUN+="ccw_init"
-ATTRS{cutype}=="3088/08", RUN+="ccw_init"
-ATTRS{cutype}=="3088/60", RUN+="ccw_init"
-ATTRS{cutype}=="3088/61", RUN+="ccw_init"
-ATTRS{cutype}=="3088/1e", RUN+="ccw_init"
-ATTRS{cutype}=="3088/1f", RUN+="ccw_init"
+DRIVER=="ctcm|lcs|qeth", RUN+="ccw_init"
 LABEL="ccw_end"

SOURCES/cmsfs-1.1.8-args.patch

@@ -1,12 +0,0 @@
-diff -up cmsfs-1.1.8c/cmsfslst.c.orig cmsfs-1.1.8c/cmsfslst.c
---- cmsfs-1.1.8c/cmsfslst.c.orig	2020-08-19 09:47:36.459063820 +0000
-+++ cmsfs-1.1.8c/cmsfslst.c	2020-08-19 09:47:45.619063820 +0000
-@@ -49,7 +49,7 @@ int main(int argc,unsigned char *argv[])
-       }
- 
-     /*  sanity check  */
--    if (*devname == 0x00)
-+    if ((devname == NULL) || (*devname == 0x00))
-       {
-         (void) fprintf(stderr,"Please specify a CMS volume.\n");
-         (void) fprintf(stderr,USAGE,argv[0]);

SOURCES/cmsfs-1.1.8-kernel26.patch

@@ -1,12 +0,0 @@
-diff -urN cmsfs-1.1.8/cmsfssed.sh cmsfs-1.1.8_/cmsfssed.sh
---- cmsfs-1.1.8/cmsfssed.sh	2003-02-28 17:52:59.000000000 -0500
-+++ cmsfs-1.1.8_/cmsfssed.sh	2004-05-28 16:36:22.000000000 -0400
-@@ -85,7 +85,7 @@
-         DRIVER_SOURCE="cmsfs22x.c"
-         MODULES_DIRECTORY="/lib/modules/`uname -r`/fs"
-         ;;
--    2.4*|2.5*)
-+    2.4*|2.5*|2.6*|3.*|4.*)
-         LINUX_RELEASE="2.4"
- #       ln -s cmsfs24x.c cmsfsvfs.c
-         INCLUDES="-I/lib/modules/`uname -r`/build/include"

SOURCES/cmsfs-1.1.8-use-detected-filesystem-block-size-on-FBA-devices.patch

@@ -1,31 +0,0 @@
-From 25442f958a12b428b7d063b927ac48965dcd8164 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Fri, 28 Jan 2011 16:11:19 +0100
-Subject: [PATCH] use detected filesystem block size on FBA devices
-
-If a FBA device is not properly formated, then the CMS file system can
-have a different block size. The cmsfs tools were able to detect the file
-system block size, but in fact they still used default 512 instead. And
-using the default was causing crashes. Now the detected value is used.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=651012
----
- cmsfsany.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/cmsfsany.c b/cmsfsany.c
-index 55bcfdc..18efffb 100644
---- a/cmsfsany.c
-+++ b/cmsfsany.c
-@@ -102,7 +102,7 @@ int cmsfs_find_label(struct CMSSUPER *vol,struct CMSFSADT *adt)
-             cmsfs_error(cmsfs_ermsg);
-           }
-         vol->flags = CMSFSFBA;
--        vol->blksz = 512;
-+        vol->blksz = blksz;
-         return vol->blksz;
-       } }
- 
--- 
-1.7.3.5
-

SOURCES/cmsfs-1.1.8-warnings.patch

@@ -1,11 +0,0 @@
---- cmsfs-1.1.8/cmsfsvol.c.warnings	2003-07-18 01:38:57.000000000 +0200
-+++ cmsfs-1.1.8/cmsfsvol.c	2005-09-06 16:57:15.000000000 +0200
-@@ -52,7 +52,7 @@
- 
-     /*  print a header;  looks like CMS  */
-     (void) printf("LABEL  VDEV M  STAT   CYL TYPE \
--BLKSZ   FILES  BLKS USED-(%) BLKS LEFT  BLK TOTAL\n");
-+BLKSZ   FILES  BLKS USED-(%%) BLKS LEFT  BLK TOTAL\n");
- 
-     for (      ; i < argc ; i++)
-       {

SOURCES/device_cio_free.service

@@ -7,7 +7,6 @@ Before=sysinit.target systemd-udev-trigger.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/sbin/device_cio_free
-StandardOutput=syslog
 
 [Install]
 WantedBy=sysinit.target

SOURCES/s390-tools-zipl-blscfg-rpm-nvr-sort.patch

@@ -1,4 +1,4 @@
-From a17c57bf2b7b6d64a509cb5fb02fe46849bc550c Mon Sep 17 00:00:00 2001
+From b2daaa34776ba6afec879e362378f6f7563590a6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
 Date: Mon, 20 Jun 2022 17:43:05 +0200
 Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
@@ -194,10 +194,10 @@ index 0cea1d4..9352f76 100644
  		return n;
  
 -- 
-2.38.1
+2.39.2
 
 
-From 7a51cfc15b870d90bffe1e24a1da922663ffe1d7 Mon Sep 17 00:00:00 2001
+From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 20 Jun 2022 17:46:59 +0200
 Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
@@ -213,7 +213,7 @@ Signed-off-by: Dan Horák <dan@danny.cz>
  2 files changed, 95 insertions(+), 2 deletions(-)
 
 diff --git a/zipl/src/Makefile b/zipl/src/Makefile
-index 64eabe4..7043005 100644
+index cab5655..7ec215d 100644
 --- a/zipl/src/Makefile
 +++ b/zipl/src/Makefile
 @@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
@@ -223,7 +223,7 @@ index 64eabe4..7043005 100644
 +	-lrpmio -lrpm
  
  objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
- 	  bootmap_header.o envblk.o install.o zipl.o $(rootdir)/zipl/boot/data.o
+ 	  bootmap_header.o envblk.o install.o zipl.o
 diff --git a/zipl/src/scan.c b/zipl/src/scan.c
 index 9352f76..3327e2d 100644
 --- a/zipl/src/scan.c
@@ -344,5 +344,5 @@ index 9352f76..3327e2d 100644
  static int
  scan_append_section_heading(struct scan_token* scan, int* index, char* name);
 -- 
-2.38.1
+2.39.2
 

SOURCES/s390utils-2.25.0-rhel.patch

@@ -1,205 +0,0 @@
-From 48324b579e825a30110abac0369e9d544350ead1 Mon Sep 17 00:00:00 2001
-From: Steffen Eiden <seiden@linux.ibm.com>
-Date: Wed, 14 Dec 2022 14:25:21 +0100
-Subject: [PATCH 1/4] zdump: replace atomic refcount with atomic int
-
-(Atomic) refcounting was introduced in glib2.58.
-We want to support v2.56 as well, so replace it with int and the atomic
-operations introduced in glib 2.4.
-
-Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/146
-Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
-Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
----
- zdump/pv_utils.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/zdump/pv_utils.c b/zdump/pv_utils.c
-index 6d9f0bb..a39bfc5 100644
---- a/zdump/pv_utils.c
-+++ b/zdump/pv_utils.c
-@@ -674,7 +674,7 @@ struct _storage_state_mmap {
- 	size_t mapped_size;
- 	pv_tweak_component_t *tweak_components;
- 	size_t num_tweaks;
--	gatomicrefcount ref_count;
-+	int ref_count;
- };
- 
- storage_state_mmap_t *storage_state_mmap_new(const int fd, const size_t file_size, const u64 offset,
-@@ -733,14 +733,14 @@ storage_state_mmap_t *storage_state_mmap_new(const int fd, const size_t file_siz
- 	ret->tweak_components = (pv_tweak_component_t *)(ptr + in_page_offset);
- 	ret->num_tweaks = tweak_components_cnt;
- 	ret->mapped_size = mmapped_size;
--	g_atomic_ref_count_init(&ret->ref_count);
-+	ret->ref_count = 1;
- 	return g_steal_pointer(&ret);
- }
- 
- storage_state_mmap_t *storage_state_mmap_ref(storage_state_mmap_t *storage_state)
- {
- 	g_assert(storage_state);
--	g_atomic_ref_count_inc(&storage_state->ref_count);
-+	g_atomic_int_inc(&storage_state->ref_count);
- 	return storage_state;
- }
- 
-@@ -748,7 +748,7 @@ void storage_state_mmap_unref(storage_state_mmap_t *storage_state)
- {
- 	if (!storage_state)
- 		return;
--	if (storage_state->ref_count && !g_atomic_ref_count_dec(&storage_state->ref_count))
-+	if (storage_state->ref_count && !g_atomic_int_dec_and_test(&storage_state->ref_count))
- 		return;
- 	if (storage_state->first_page_ptr) {
- 		int rc = munmap(storage_state->first_page_ptr, storage_state->mapped_size);
--- 
-2.39.1
-
-
-From 4007220d35a9e33186fdfe3a4b5c22cd2eea9bb9 Mon Sep 17 00:00:00 2001
-From: Steffen Eiden <seiden@linux.ibm.com>
-Date: Wed, 14 Dec 2022 13:53:29 +0100
-Subject: [PATCH 2/4] libpv: disallow glib features from after 2.56
-
-Enforce that the first glib.h include is done via glib-helper.h for libpv
-so that glib version checks are in place.
-
-Change zdump and pvattest such that they never include glibstuff before
-libpv/glib-helper.h
-
-Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
-Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
----
- include/libpv/glib-helper.h | 6 ++++++
- pvattest/src/common.h       | 2 +-
- zdump/dfi_pv_elf.c          | 1 -
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/include/libpv/glib-helper.h b/include/libpv/glib-helper.h
-index 5d3df50..9f90b28 100644
---- a/include/libpv/glib-helper.h
-+++ b/include/libpv/glib-helper.h
-@@ -18,6 +18,12 @@
- #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56
- #endif
- 
-+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56
-+
-+#ifdef __G_LIB_H__
-+#error "glib.h must be included via libpv/glib-helper.h"
-+#endif
-+
- #include <glib.h>
- #include <gmodule.h>
- #include <stdio.h>
-diff --git a/pvattest/src/common.h b/pvattest/src/common.h
-index e2e3ef1..43d2ab9 100644
---- a/pvattest/src/common.h
-+++ b/pvattest/src/common.h
-@@ -11,10 +11,10 @@
- /* Must be included before any other header */
- #include "config.h"
- 
--#include <glib/gi18n.h>
- #include <stdio.h>
- 
- #include "libpv/glib-helper.h"
-+#include <glib/gi18n.h>
- #include "libpv/macros.h"
- #include "lib/zt_common.h"
- 
-diff --git a/zdump/dfi_pv_elf.c b/zdump/dfi_pv_elf.c
-index 8d1021e..9d33e8f 100644
---- a/zdump/dfi_pv_elf.c
-+++ b/zdump/dfi_pv_elf.c
-@@ -21,7 +21,6 @@
- #include <elf.h>
- #include <errno.h>
- 
--#include <glib.h>
- #include <openssl/bio.h>
- #include <openssl/crypto.h>
- 
--- 
-2.39.1
-
-
-From fb01fb45bb6a9e62313e9cdb79ad5ed39471cfe7 Mon Sep 17 00:00:00 2001
-From: Marc Hartmayer <mhartmay@linux.ibm.com>
-Date: Mon, 19 Dec 2022 09:51:51 +0000
-Subject: [PATCH 3/4] zgetdump/Makefile: don't use `.check_dep_zgetdump` as
- linker input
-
-The `.check_dep_zgetdump` file is used to cache the result of the
-dependency checks and should not be used as input for linking or
-anything else. Let's add it as dependency for the objects file. This
-shouldn't cause any problems since the Makefile rule for object files is
-defined in `common.mak` as follows:
-
-%.o: %.c
-	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@
-
-Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/147
-Fixes: 8d8d5e9746a4 ("zdump: Fix Makefile dependencies")
-Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
-Signed-off-by: Jan Hoeppner <hoeppner@linux.ibm.com>
----
- zdump/Makefile | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/zdump/Makefile b/zdump/Makefile
-index ca8aadc..934dc47 100644
---- a/zdump/Makefile
-+++ b/zdump/Makefile
-@@ -119,7 +119,9 @@ libs = $(rootdir)/libutil/libutil.a $(LIBPV)
- 
- all: $(BUILD_TARGETS)
- 
--zgetdump: .check_dep_zgetdump $(OBJECTS) $(libs)
-+$(OBJECTS): .check_dep_zgetdump
-+
-+zgetdump: $(OBJECTS) $(libs)
- 
- skip-zgetdump:
- 	echo "  SKIP    zgetdump due to unresolved dependencies"
--- 
-2.39.1
-
-
-From 1ad208c17a0edc65e6abd47b68a7d9c206faf2a6 Mon Sep 17 00:00:00 2001
-From: Ingo Franzki <ifranzki@linux.ibm.com>
-Date: Fri, 20 Jan 2023 11:04:18 +0100
-Subject: [PATCH 4/4] zkey: Support EP11 host library version 4 (#2165811)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Try to load libep11.so.4 if available, but fallback to older
-library versions if not.
-
-Reviewed-by: Jörg Schmidbauer <jschmidb@de.ibm.com>
-Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
-Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
-(cherry picked from commit 6222c384958729bc4b5bad61ad38967647cc3248)
----
- zkey/ep11.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zkey/ep11.c b/zkey/ep11.c
-index 58dc3c5..8359929 100644
---- a/zkey/ep11.c
-+++ b/zkey/ep11.c
-@@ -35,7 +35,7 @@
-  * Definitions for the EP11 library
-  */
- #define EP11_LIBRARY_NAME	"libep11.so"
--#define EP11_LIBRARY_VERSION	3
-+#define EP11_LIBRARY_VERSION	4
- #define EP11_WEB_PAGE		"http://www.ibm.com/security/cryptocards"
- 
- /**
--- 
-2.39.1
-

SOURCES/src_vipa-2.1.0-deprecate.patch

@@ -1,12 +0,0 @@
-diff -up s390-tools-2.2.0/src_vipa-2.1.0/Makefile.orig s390-tools-2.2.0/src_vipa-2.1.0/Makefile
---- s390-tools-2.2.0/src_vipa-2.1.0/Makefile.orig	2020-02-21 13:51:23.502305796 +0100
-+++ s390-tools-2.2.0/src_vipa-2.1.0/Makefile	2020-02-21 13:53:51.353817181 +0100
-@@ -44,6 +44,8 @@ src_vipa.sh:
- 	echo '#!/bin/bash' > src_vipa.sh
- 	echo 'export LD_LIBRARY_PATH=$(LIBDIR):$$LD_LIBRARY_PATH' >> src_vipa.sh
- 	echo 'export LD_PRELOAD=$(LIBDIR)/src_vipa.so' >> src_vipa.sh
-+	echo 'echo "WARNING: The src_vipa (flexible source address selection) feature is DEPRECATED"' >> src_vipa.sh
-+	echo 'echo "WARNING: It will be removed in the future."' >> src_vipa.sh
- 	echo 'exec $$@' >> src_vipa.sh
- 	chmod 755 src_vipa.sh
-