.gitignore

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

.s390utils.metadata

@@ -1 +0,0 @@
-5b4eeed3868297ca65b7d5720484786172dc11d1 SOURCES/s390-tools-2.19.0.tar.gz

SOURCES/00-zipl-prepare.install

@@ -0,0 +1,9 @@
+#!/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,4 +1,13 @@
-ACTION!="add|bind|change", GOTO="ccw_end"
+ACTION!="add|change", GOTO="ccw_end"
 SUBSYSTEM!="ccw", GOTO="ccw_end"
-DRIVER=="ctcm|lcs|qeth", RUN+="ccw_init"
+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"
 LABEL="ccw_end"

SOURCES/cmsfs-1.1.8-args.patch

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+diff -aruN cmsfs-1.1.8c/cmsfssed.sh cmsfs-1.1.8c.alma/cmsfssed.sh
+--- cmsfs-1.1.8c/cmsfssed.sh	2006-01-29 07:04:32
++++ cmsfs-1.1.8c.alma/cmsfssed.sh	2023-11-01 10:57:10
+@@ -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.*|5.*)
+         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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,11 @@
+--- 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,6 +7,7 @@ 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,19 +1,234 @@
-diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/Makefile
---- s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort	2019-05-22 08:16:17.317273801 -0400
-+++ s390-tools-2.9.0/zipl/src/Makefile	2019-05-22 08:18:02.947273801 -0400
-@@ -7,7 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
- 	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
- ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+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
+ versions"
+
+This reverts commit a0dba6bfdb50ff373fa710ffe2a307cc0748f18b.
+---
+ zipl/src/scan.c | 139 ++----------------------------------------------
+ 1 file changed, 3 insertions(+), 136 deletions(-)
+
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 0cea1d4..9352f76 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -10,7 +10,6 @@
+  *
+  */
  
--libs = $(rootdir)/libutil/libutil.a
-+libs = $(rootdir)/libutil/libutil.a -lrpmio -lrpm
+-static const char *VERSION_KEYWORD = "version";
+ 
+ /* Need ISOC99 function isblank() in ctype.h */
+ #ifndef __USE_ISOC99
+@@ -646,7 +645,7 @@ scan_file(const char* filename, struct scan_token** token)
+ 
+ 
+ static int
+-bls_filter_by_names(const struct dirent *ent)
++bls_filter(const struct dirent *ent)
+ {
+ 	int offset = strlen(ent->d_name) - strlen(".conf");
+ 
+@@ -656,111 +655,13 @@ bls_filter_by_names(const struct dirent *ent)
+ 	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
+ }
+ 
+-struct version {
+-	char *line; /* pointer to a line with version keyword */
+-	int offset; /* offset of version value in the line */
+-};
+-
+-/*
+- * Locate version in bls file represented by ENT
+- */
+-static void get_version(const struct dirent *ent, struct version *v)
+-{
+-	char *line = NULL;
+-	size_t len = 0;
+-	char *d_name;
+-	FILE *stream;
+-	ssize_t read;
+-
+-	memset(v, 0, sizeof(*v));
+-	d_name = misc_make_path((char *)blsdir, (char *)ent->d_name);
+-	if (!d_name)
+-		return;
+-
+-	stream = fopen(d_name, "r");
+-	free(d_name);
+-	if (!stream)
+-		return;
+-
+-	while ((read = getline(&line, &len, stream)) != -1) {
+-		if (line[read - 1] == '\n') {
+-			line[read - 1] = '\0';
+-			read--;
+-		}
+-		if ((size_t)read <= strlen(VERSION_KEYWORD) + 1)
+-			continue;
+-		if (strcmp(VERSION_KEYWORD, line) > 0)
+-			continue;
+-		if (!isblank(line[strlen(VERSION_KEYWORD)]))
+-			continue;
+-		/* skip blanks */
+-		v->offset = strlen(VERSION_KEYWORD) + 1;
+-		while (v->offset < read - 1 && isblank(line[v->offset]))
+-			v->offset++;
+-		if (isblank(line[v->offset]))
+-			/*
+-			 * all characters after the keyword
+-			 * are blanks. Invalid version
+-			 */
+-			continue;
+-		v->line = line;
+-		fclose(stream);
+-		return;
+-	}
+-	free(line);
+-	fclose(stream);
+-}
+-
+-static void put_version(struct version *v)
+-{
+-	free(v->line);
+-}
+-
+-/**
+- * Check version in bls file represented by ENT.
+- * Return 1 if version is valid. Otherwise return 0
+- */
+-static int bls_filter_by_versions(const struct dirent *ent)
+-{
+-	struct version v;
+-
+-	if (bls_filter_by_names(ent) == 0)
+-		return 0;
+-
+-	get_version(ent, &v);
+-	if (v.line) {
+-		put_version(&v);
+-		return 1;
+-	}
+-	return 0;
+-}
+-
+ 
+ static int
+-bls_sort_by_names(const struct dirent **ent_a, const struct dirent **ent_b)
++bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
+ {
+ 	return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
+ }
+ 
+-static int
+-bls_sort_by_versions(const struct dirent **ent_a, const struct dirent **ent_b)
+-{
+-	struct version v1, v2;
+-	int ret;
+-
+-	get_version(*ent_a, &v1);
+-	get_version(*ent_b, &v2);
+-	/*
+-	 * Both versions are valid.
+-	 * It is guaranteed by bls_filter_by_versions()
+-	 */
+-	ret = strverscmp(v1.line + v1.offset, v2.line + v2.offset);
+-
+-	put_version(&v1);
+-	put_version(&v2);
+-
+-	return ret;
+-}
+ 
+ static int
+ scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+@@ -1110,40 +1011,6 @@ scan_count_target_keywords(char* keyword[])
+ 	return num;
+ }
+ 
+-static int bls_scandir(struct dirent ***bls_entries)
+-{
+-	struct dirent **entries1;
+-	struct dirent **entries2;
+-	int n1, n2;
+-
+-	/* arrange by names */
+-	n1 = scandir(blsdir, &entries1,
+-		     bls_filter_by_names, bls_sort_by_names);
+-	if (n1 <= 0)
+-		return n1;
+-	/* arrange by versions */
+-	n2 = scandir(blsdir, &entries2,
+-		     bls_filter_by_versions, bls_sort_by_versions);
+-
+-	if (n2 <= 0 || n2 < n1) {
+-		/*
+-		 * failed to sort by versions,
+-		 * fall back to sorting by filenames
+-		 */
+-		*bls_entries = entries1;
+-		while (n2--)
+-			free(entries2[n2]);
+-		free(entries2);
+-		return n1;
+-	}
+-	/* use arrangement by versions */
+-	*bls_entries = entries2;
+-	while (n1--)
+-		free(entries1[n1]);
+-	free(entries1);
+-	return n2;
+-}
+-
+ int
+ scan_check_target_data(char* keyword[], int* line)
+ {
+@@ -1464,7 +1331,7 @@ int scan_bls(struct scan_token **token, int scan_size)
+ 	if (!(stat(blsdir, &sb) == 0 && S_ISDIR(sb.st_mode)))
+ 		return 0;
+ 
+-	n = bls_scandir(&bls_entries);
++	n = scandir(blsdir, &bls_entries, bls_filter, bls_sort);
+ 	if (n <= 0)
+ 		return n;
+ 
+-- 
+2.39.2
+
+
+From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 20 Jun 2022 17:46:59 +0200
+Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Dan Horák <dan@danny.cz>
+---
+ zipl/src/Makefile |  1 +
+ zipl/src/scan.c   | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 95 insertions(+), 2 deletions(-)
+
+diff --git a/zipl/src/Makefile b/zipl/src/Makefile
+index cab5655..7ec215d 100644
+--- a/zipl/src/Makefile
++++ b/zipl/src/Makefile
+@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+ 
+ libs =  $(rootdir)/libutil/libutil.a \
+ 	$(rootdir)/libvtoc/libvtoc.a \
++	-lrpmio -lrpm
  
  objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
- 	  bootmap_header.o envblk.o install.o zipl.o $(rootdir)/zipl/boot/data.o
-diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/scan.c
---- s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort	2019-05-21 09:13:36.000000000 -0400
-+++ s390-tools-2.9.0/zipl/src/scan.c	2019-05-22 08:16:17.317273801 -0400
-@@ -33,6 +33,8 @@
+ 	  bootmap_header.o envblk.o install.o zipl.o
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 9352f76..3327e2d 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -35,6 +35,8 @@
  
  #include "lib/util_base.h"
  
@@ -22,7 +237,7 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
  #include "boot.h"
  #include "error.h"
  #include "misc.h"
-@@ -653,13 +655,103 @@ bls_filter(const struct dirent *ent)
+@@ -655,13 +657,103 @@ bls_filter(const struct dirent *ent)
  	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
  }
  
@@ -128,3 +343,6 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
  
  static int
  scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+-- 
+2.39.2
+

SOURCES/s390-tools-zipl-invert-script-options.patch

@@ -61,10 +61,10 @@ index 871935c783f..d8d5eca5867 100755
  	    ;;
  	--)
  	    shift
-diff --git a/scripts/zipl-switch-to-blscfg.1 b/scripts/zipl-switch-to-blscfg.1
+diff --git a/scripts/zipl-switch-to-blscfg.8 b/scripts/zipl-switch-to-blscfg.8
 index 6bd14d00d14..71b904ffd1c 100644
---- a/scripts/zipl-switch-to-blscfg.1
-+++ b/scripts/zipl-switch-to-blscfg.1
+--- a/scripts/zipl-switch-to-blscfg.8
++++ b/scripts/zipl-switch-to-blscfg.8
 @@ -37,9 +37,9 @@ The DIRECTORY where the BLS fragments will be generated. The directory is create
  The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
  

SOURCES/src_vipa-2.1.0-deprecate.patch

@@ -0,0 +1,12 @@
+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
+