New release s390-tools-2.27.0

Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
common.mak: make *clean targets mutually exclusive
2026-08-05 02:14:52 +00:00 · 2023-05-30 14:42:12 +02:00 · 2023-05-30 13:31:53 +02:00 · 2023-05-30 13:31:53 +02:00 · 2023-05-30 13:31:53 +02:00 · 2023-05-30 13:31:53 +02:00
59 changed files with 952 additions and 443 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@
 tags
 TAGS

+# clangd cache (https://clangd.llvm.org/design/indexing#backgroundindex)
+.cache/
+
 # Ignore coverage data
 *.gcda
 *.gcno
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,37 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------

+* __v2.27.0 (2023-05-30)__
+
+  For Linux kernel version: 6.3
+
+  Changes of existing tools:
+   - s390-tools cross-compile and non-s390x support:
+      - `pkg-config` is now mandatory for the build process
+      - Add `PKG_CONFIG` Makefile variable to select pkg-config program;
+        default `pkg-config` or `$(CROSS_COMPILE)pkg-config` if
+        `CROSS_COMPILE` is set
+      - Rename Makefile variable `ARCH` to `HOST_ARCH`. `HOST_ARCH` is the
+        architecture that will run the produced (executable) objects
+      - Add the Makefile variable `BUILD_ARCH`. `BUILD_ARCH` is the
+        architecture of the build system. For each Makefile variable like
+        `CC`, `LINK`, `CPP`, ... there is a suffixed version of it - e.g.
+        `CC_FOR_BUILD`. This is useful for cross compiling, and this naming
+        convention is very similar to the Meson convention (see
+        https://mesonbuild.com/Reference-tables.html#environment-variables-per-machine).
+      - Limit build targets for non-s390x architectures (pvattest)
+  - dasdfmt: Fall back to full format if space release fails
+  - dbginfo.sh: Add nstat for network and SNMP stats
+  - dbginfo.sh: Rework crypto data collection
+  - hyptop: Show thread util by default
+  - zipl: Add support for list-directed IPL dump from ECKD DASD
+
+  Bug Fixes:
+  - lszcrypt: Fix argument parsing
+  - zdev/dracut: Fix out-of-memory (OOM) situations in the kdump crashkernel environment
+  - ziomon/ziorep_config: Fix for SCSI devices of type disk without block dev
+  - pvextract-hdr: Fix parsing issues on little-endian systems
+
 * __v2.26.0 (2023-02-14)__

  For Linux kernel version: 6.2
--- a/14
+++ b/14
@@ -1,5 +1,3 @@
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-
 # Include common definitions
 include common.mak

@@ -8,6 +6,7 @@ include common.mak
 # LIBS: Libraries that can have a dependency to base libraries
 # TOOLS: Tools that can have a dependency to base libraries or libraries
 #
+ifeq ($(HOST_ARCH),s390x)
 BASELIB_DIRS = libutil libseckey
 LIB_DIRS = libvtoc libzds libdasd libccw libvmcp libekmfweb \
 	   libkmipclient libcpumf libap libpv
@@ -17,6 +16,11 @@ TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
 	   ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \
 	   systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc zpcictl \
 	   genprotimg lsstp hsci hsavmcore chreipl-fcp-mpath ap_tools pvattest
+else
+BASELIB_DIRS =
+LIB_DIRS = libpv
+TOOL_DIRS = pvattest
+endif

 SUB_DIRS = $(BASELIB_DIRS) $(LIB_DIRS) $(TOOL_DIRS)

@@ -49,15 +53,15 @@ endif

 $(TOOL_DIRS): $(LIB_DIRS)
 	$(foreach goal,$(MAKECMDGOALS), \
-		$(MAKE) -C $@ TOPDIR=$(TOPDIR) ARCH=$(ARCH) $(goal) ;)
+		$(MAKE) -C $@ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) $(goal) ;)
 .PHONY: $(TOOL_DIRS)

 $(LIB_DIRS): $(BASELIB_DIRS)
 	$(foreach goal,$(MAKECMDGOALS), \
-		$(MAKE) -C $@ TOPDIR=$(TOPDIR) ARCH=$(ARCH) $(goal) ;)
+		$(MAKE) -C $@ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) $(goal) ;)
 .PHONY: $(LIB_DIRS)

 $(BASELIB_DIRS):
 	$(foreach goal,$(MAKECMDGOALS), \
-		$(MAKE) -C $@ TOPDIR=$(TOPDIR) ARCH=$(ARCH) $(goal) ;)
+		$(MAKE) -C $@ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) $(goal) ;)
 .PHONY: $(BASELIB_DIRS)
--- a/README.md
+++ b/README.md
@@ -325,8 +325,8 @@ This table lists additional build or install options:
 | initramfs-tools  | `HAVE_INITRAMFS`             | zdev, zipl               |
 |                  | `ZDEV_ALWAYS_UPDATE_INITRD`  | zdev                     |

-The s390-tools build process uses "pkg-config" if available and hard-coded
-compiler and linker options otherwise.
+The s390-tools build process uses "pkg-config" and therefore it must be
+available.

 Build and runtime requirements for specific tools
 -------------------------------------------------
--- a/chreipl-fcp-mpath/chreipl-fcp-mpath.mak
+++ b/chreipl-fcp-mpath/chreipl-fcp-mpath.mak
@@ -74,7 +74,7 @@ ALL_PANDOCFLAGS	 = --preserve-tabs --tab-stop=8 --strip-comments	\
 		   -M date="$(shell date +'%Y-%m-%d')"			\
 		   $(PANDOCFLAGS)

-$(eval $(call cmd_define, PANDOC,"  PANDOC  ",pandoc))
+$(eval $(call cmd_define_and_export, PANDOC,"  PANDOC  ",pandoc))

 %.html : ALL_PANDOCFLAGS += -t html
 %.html : %.md
--- a/cmsfs-fuse/Makefile
+++ b/cmsfs-fuse/Makefile
@@ -22,13 +22,8 @@ check_dep:

 all: check_dep cmsfs-fuse

-ifneq ($(shell sh -c 'command -v pkg-config'),)
-FUSE_CFLAGS = $(shell pkg-config --silence-errors --cflags fuse3)
-FUSE_LDLIBS = $(shell pkg-config --silence-errors --libs fuse3)
-else
-FUSE_CFLAGS = -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse3
-FUSE_LDLIBS = -lfuse3
-endif
+FUSE_CFLAGS = $(shell $(PKG_CONFIG) --silence-errors --cflags fuse3)
+FUSE_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs fuse3)
 ALL_CFLAGS += -DHAVE_SETXATTR $(FUSE_CFLAGS)
 LDLIBS += $(FUSE_LDLIBS) -lm

--- a/common.mak
+++ b/common.mak
@@ -1,25 +1,47 @@
-ifndef $(COMMON_INCLUDED)
-COMMON_INCLUDED = true
+COMMON_INCLUDED ?= false
+V ?= 0
+W ?= 0
+G ?= 0
+C ?= 0
+D ?= 0
+ASAN ?= 0
+ENABLE_WERROR ?= 0
+OPT_FLAGS ?=
+MAKECMDGOALS ?=
+
+ifeq ($(COMMON_INCLUDED),false)
+COMMON_INCLUDED := true
+
+# 'BUILD_ARCH' is the architecture of the machine where the build takes place
+BUILD_ARCH := $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sun4u/sparc64/' -e 's/arm.*/arm/' -e 's/sa110/arm/')
+# 'HOST_ARCH' is the architecture of the machine that will run the compiled output
+HOST_ARCH ?= $(BUILD_ARCH)
+
+# The `*clean` targets are mutually exclusive to all other targets
+ifneq ($(filter %clean,$(MAKECMDGOALS)),)
+  ifneq ($(MAKECMDGOALS),$(filter %clean,$(MAKECMDGOALS)))
+    $(error The *clean targets are mutually exclusive to all other targets)
+  endif
+endif

 # Global definitions
 # The variable "DISTRELEASE" should be overwritten in rpm spec files with:
 # "make DISTRELEASE=%{release}" and "make install DISTRELEASE=%{release}"
 VERSION            = 2
-RELEASE            = 26
+RELEASE            = 27
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)
 export S390_TOOLS_RELEASE

-reldir = $(subst $(shell cd -P $(dir $(filter %common.mak,$(MAKEFILE_LIST))); \
-	 pwd)/,,$(CURDIR))
+reldir = $(subst $(realpath $(dir $(filter %common.mak,$(MAKEFILE_LIST))))/,,$(CURDIR))
 rootdir= $(dir $(filter %common.mak,$(MAKEFILE_LIST)))
 export S390_TEST_LIB_PATH=$(rootdir)/s390-tools-testsuite/lib

 #
-# For cross compiles specify CROSS_COMPILE= on the commandline:
+# For cross compiles specify HOST_ARCH= and CROSS_COMPILE= on the commandline:
 #
-# $ make CROSS_COMPILE="s390x-5.1.0-"
+# $ make HOST_ARCH=s390x CROSS_COMPILE="s390x-linux-gnu-"
 #

 CROSS_COMPILE   =
@@ -29,8 +51,10 @@ CROSS_COMPILE   =
 #
 #  $ make CC=gcc-4.8
 #
-# The "cmd_define" macro wraps the command definition so that the commands
-# can be user supplied and are still pretty-printed for the build process.
+# The "cmd_define_and_export" macro wraps the command definition so that
+# the commands can be user supplied and are still pretty-printed for the
+# build process. In addition, the command variable gets exported so it
+# can be used by sub-makes.
 #
 # The macro is called with the following parameters:
 #
@@ -40,13 +64,14 @@ CROSS_COMPILE   =
 #
 # The Example below...
 #
-#  $(eval $(call cmd_define,     CC,"  CC      ",$(CROSS_COMPILE)gcc))
+#  $(eval $(call cmd_define_and_export,     CC,"  CC      ",$(CROSS_COMPILE)gcc))
 #
 # ... produces the following code:
 #
 #  CC              = $(CROSS_COMPILE)gcc
 #  CC_SILENT      := $(CC)
 #  override CC     = $(call echocmd,"  CC      ",/$@)$(CC_SILENT)
+#  export CC
 #
 # The "strip" make function is used for the first parameter to allow blanks,
 # which improves readability.
@@ -58,23 +83,47 @@ define cmd_define
 	override $(strip $(1))	 = $$(call echocmd,$(2),/$$@)$$($(strip $(1))_SILENT)
 endef

-$(eval $(call cmd_define,     AS,"  AS      ",$(CROSS_COMPILE)as))
-$(eval $(call cmd_define,     CC,"  CC      ",$(CROSS_COMPILE)gcc))
-$(eval $(call cmd_define,   LINK,"  LINK    ",$(CC)))
-$(eval $(call cmd_define, HOSTCC,"  HOSTCC  ",gcc))
-$(eval $(call cmd_define,    CXX,"  CXX     ",$(CROSS_COMPILE)g++))
-$(eval $(call cmd_define, LINKXX,"  LINKXX  ",$(CXX)))
-$(eval $(call cmd_define,    CPP,"  CPP     ",$(CROSS_COMPILE)gcc -E))
-$(eval $(call cmd_define,     AR,"  AR      ",$(CROSS_COMPILE)ar))
-$(eval $(call cmd_define,     NM,"  NM      ",$(CROSS_COMPILE)nm))
-$(eval $(call cmd_define,  STRIP,"  STRIP   ",$(CROSS_COMPILE)strip))
-$(eval $(call cmd_define,OBJCOPY,"  OBJCOPY ",$(CROSS_COMPILE)objcopy))
-$(eval $(call cmd_define,OBJDUMP,"  OBJDUMP ",$(CROSS_COMPILE)objdump))
+define cmd_define_and_export
+	$(call cmd_define,$(1),$(2),$(3))
+	export $(strip $(1))
+endef
+
+define define_toolchain_variables
+	$(eval $(call cmd_define_and_export,     AS$(1),"  AS$(1)       ",$(2)as))
+	$(eval $(call cmd_define_and_export,     CC$(1),"  CC$(1)       ",$(2)gcc))
+	$(eval $(call cmd_define_and_export,   LINK$(1),"  LINK$(1)     ",$$(CC$(1))))
+	$(eval $(call cmd_define_and_export,    CXX$(1),"  CXX$(1)      ",$(2)g++))
+	$(eval $(call cmd_define_and_export, LINKXX$(1),"  LINKXX$(1)   ",$$(CXX$(1))))
+	$(eval $(call cmd_define_and_export,    CPP$(1),"  CPP$(1)      ",$(2)gcc -E))
+	$(eval $(call cmd_define_and_export,     AR$(1),"  AR$(1)       ",$(2)ar))
+	$(eval $(call cmd_define_and_export,     NM$(1),"  NM$(1)       ",$(2)nm))
+	$(eval $(call cmd_define_and_export,   STRIP$(1),"  STRIP$(1)    ",$(2)strip))
+	$(eval $(call cmd_define_and_export,OBJCOPY$(1),"  OBJCOPY$(1)  ",$(2)objcopy))
+	$(eval $(call cmd_define_and_export,OBJDUMP$(1),"  OBJDUMP$(1)  ",$(2)objdump))
+	$(eval PKG_CONFIG$(1) = pkg-config)
+	$(eval export PKG_CONFIG$(1))
+endef
+
+# If the host architecture is not the same as the build architecture
+# 'CROSS_COMPILE=...' is always required (except for the '*clean' targets).
+ifneq ($(HOST_ARCH),$(BUILD_ARCH))
+  ifeq ($(CROSS_COMPILE),)
+    # `make clean` and similar must always work!
+    ifeq ($(filter %clean,$(MAKECMDGOALS)),)
+      $(error Please specify CROSS_COMPILE=... and try it again!)
+    endif
+  endif
+endif
+
+$(call define_toolchain_variables,_FOR_BUILD,)
+$(call define_toolchain_variables,,$(CROSS_COMPILE))
+
 $(eval $(call cmd_define,RUNTEST,"  RUNTEST ",$(S390_TEST_LIB_PATH)/s390_runtest))
 $(eval $(call cmd_define,    CAT,"  CAT     ",cat))
 $(eval $(call cmd_define,    SED,"  SED     ",sed))
 $(eval $(call cmd_define,   GZIP,"  GZIP    ",gzip))
 $(eval $(call cmd_define,     MV,"  MV      ",mv))
+$(eval $(call cmd_define,  PERLC,"  PERLC   ",perl -c))

 CHECK           = sparse
 CHECK_SILENT   := $(CHECK)
@@ -101,6 +150,10 @@ else
 	DEFAULT_CFLAGS += -O3
 endif

+ifeq ("${ENABLE_WERROR}", "1")
+	DEFAULT_CFLAGS += -Werror
+endif
+
 DEFAULT_CPPFLAGS = -D_GNU_SOURCE
 DEFAULT_LDFLAGS = -rdynamic

@@ -109,6 +162,11 @@ ifeq ("${ASAN}","1")
 	DEFAULT_LDFLAGS += -fsanitize=address
 endif

+DEFAULT_PERLCFLAGS =
+ifeq ("${W}","1")
+	DEFAULT_PERLCFLAGS += -w
+endif
+
 #
 # Check for header prerequisite
 #
@@ -235,10 +293,10 @@ ZFCPDUMP_INITRD	= zfcpdump-initrd
 ZFCPDUMP_FLAVOR	= zfcpdump
 export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_INITRD ZFCPDUMP_FLAVOR

-CFLAGS		?= $(DEFAULT_CFLAGS) $(OPT_FLAGS)
-HOSTCFLAGS	?= $(DEFAULT_CFLAGS) $(OPT_FLAGS)
-CPPFLAGS	?= $(DEFAULT_CPPFLAGS)
-LDFLAGS		?= $(DEFAULT_LDFLAGS)
+CFLAGS		 ?= $(DEFAULT_CFLAGS) $(OPT_FLAGS)
+CFLAGS_FOR_BUILD ?= $(DEFAULT_CFLAGS) $(OPT_FLAGS)
+CPPFLAGS	 ?= $(DEFAULT_CPPFLAGS)
+LDFLAGS		 ?= $(DEFAULT_LDFLAGS)

 ALL_CFLAGS	= -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
 			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
@@ -256,6 +314,8 @@ ALL_CXXFLAGS	= -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
 ALL_CPPFLAGS	= -I $(rootdir)include $(CPPFLAGS)
 ALL_LDFLAGS	= $(LDFLAGS)

+ALL_PERLCFLAGS	= $(DEFAULT_PERLCFLAGS)
+
 # make G=1
 # Compile tools so that gcov can be used to collect code coverage data.
 # See the gcov man page for details.
@@ -264,7 +324,7 @@ ALL_CFLAGS := $(filter-out -O%,$(ALL_CFLAGS)) --coverage
 ALL_CXXFLAGS := $(filter-out -O%,$(ALL_CXXFLAGS)) --coverage
 ALL_LDFLAGS += --coverage
 endif
-export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS CXXFLAGS \
+export INSTALL CFLAGS CXXFLAGS \
       LDFLAGS CPPFLAGS ALL_CFLAGS ALL_CXXFLAGS ALL_LDFLAGS ALL_CPPFLAGS

 ifneq ($(shell $(CC_SILENT) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
@@ -302,12 +362,13 @@ help:
 	@echo '  clean    Delete all generated files'
 	@echo ''
 	@echo 'OPTIONS'
-	@echo '  D=1      Build with debugging option "-Og"'
-	@echo '  C=1      Build with check tool defined with "CHECK=" (default=sparse)'
-	@echo '  G=1      Build with gcov to collect code coverage data'
-	@echo '  V=1      Generate verbose build output'
-	@echo '  W=1      Build with higher warning level'
-	@echo '  ASAN=1   Build with address sanitizer'
+	@echo '  D=1      	 Build with debugging option "-Og"'
+	@echo '  C=1      	 Build with check tool defined with "CHECK=" (default=sparse)'
+	@echo '  G=1      	 Build with gcov to collect code coverage data'
+	@echo '  V=1      	 Generate verbose build output'
+	@echo '  W=1		 Build with higher warning level'
+	@echo '  ASAN=1   	 Build with address sanitizer'
+	@echo '  ENABLE_WERROR=1 Build with -Werror'
 	@echo ''
 	@echo 'EXAMPLES'
 	@echo '  # make clean all D=1 W=1 -j'
--- a/cpumf/man/lshwc.8
+++ b/cpumf/man/lshwc.8
@@ -88,12 +88,6 @@ Include the MT_Diagnostic counter set.
 Include the problem counter set.
 .IP a
 Include all known counter sets (default).
-.SH "Concurrency with perf tool"
-The \*c tool and the linux
-.B perf
-tool use the same hardware and cannot be used concurrently.
-Both tools print an error message and abort when they
-detect this situation.
 .SH "EXAMPLES"
 The first example enables the basic and problem counter sets on CPU 0 and 1.
 Two read operations are performed and a summary line is printed for each
--- a/dasdfmt/dasdfmt.8
+++ b/dasdfmt/dasdfmt.8
@@ -118,12 +118,17 @@ Specify the \fImode\fR to be used to format the device. Valid modes are:
 .IP full
 Format the entire disk with the specified blocksize. (default)
 .IP quick
-Format the first two tracks and write label and partition information. Only use
-this option if you are sure that the target DASD already contains a regular
+Format the first two tracks and write label and partition information. Use this
+option only if you are sure that the target DASD already contains a regular
 format with the specified blocksize. A blocksize can optionally be specified
 using \fB-b\fR (\fB--blocksize\fR).
 .br
-For thin-provisioned DASD ESE volumes this is the default mode.
+For thin-provisioned DASD ESE volumes, quick is the default mode. A full space
+release then precedes the formatting step. If this space release fails, dasdfmt
+falls back to a full-format  mode. Formatting stops if the space release fails
+and quick mode was specified explicitly using \fB-M\fR. Specify the
+\fB--no-discard\fR option to omit the space release.
+
 .IP expand
 Format all unformatted tracks at the end of the target DASD. This mode assumes
 that tracks at the beginning of the DASD volume have already been correctly
--- a/dasdfmt/dasdfmt.c
+++ b/dasdfmt/dasdfmt.c
@@ -1230,7 +1230,7 @@ static void dasdfmt_find_start(unsigned int cylinders, unsigned int heads,
 	format_params->start_unit = first;
 }

-static void dasdfmt_release_space(void)
+static int dasdfmt_release_space(void)
 {
 	format_data_t r = {
 		.start_unit = 0,
@@ -1240,12 +1240,21 @@ static void dasdfmt_release_space(void)
 	int err = 0;

 	if (!g.ese || g.no_discard)
-		return;
+		return 0;

 	printf("Releasing space for the entire device...\n");
 	err = dasd_release_space(g.dev_node, &r);
-	if (err)
+	/*
+	 * Warn or Error on failing RAS depending on QUICK mode set explicitly or automatically
+	 */
+	if (err && !g.mode_specified) {
+		warnx("Could not release space. Falling back to full format.");
+		return 1;
+	} else if (err && g.mode_specified) {
 		error("Could not release space: %s", strerror(err));
+	}
+
+	return 0;
 }

 static void dasdfmt_prepare_and_format(unsigned int cylinders, unsigned int heads,
@@ -1445,8 +1454,12 @@ static void do_format_dasd(volume_label_t *vlabel, format_data_t *p,
 			dasdfmt_prepare_and_format(cylinders, heads, p);
 			break;
 		case QUICK:
-			dasdfmt_release_space();
-			dasdfmt_quick_format(cylinders, heads, p);
+			if (dasdfmt_release_space()) {
+				p->stop_unit  = (cylinders * heads) - 1;
+				dasdfmt_prepare_and_format(cylinders, heads, p);
+			} else {
+				dasdfmt_quick_format(cylinders, heads, p);
+			}
 			break;
 		case EXPAND:
 			dasdfmt_expand_format(cylinders, heads, p);
--- a/dasdview/Makefile
+++ b/dasdview/Makefile
@@ -16,13 +16,8 @@ check_dep:

 BUILDTARGET = check_dep

-ifneq ($(shell sh -c 'command -v pkg-config'),)
-CURL_CFLAGS = $(shell pkg-config --silence-errors --cflags libcurl)
-CURL_LDLIBS = $(shell pkg-config --silence-errors --libs libcurl)
-else
-CURL_CFLAGS = -I/usr/include/s390x-linux-gnu/curl
-CURL_LDLIBS = -lcurl
-endif # shell
+CURL_CFLAGS = $(shell $(PKG_CONFIG) --silence-errors --cflags libcurl)
+CURL_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs libcurl)

 endif # HAVE_CURL

--- a/genprotimg/boot/Makefile
+++ b/genprotimg/boot/Makefile
@@ -15,7 +15,7 @@ ALL_CFLAGS := $(NO_PIE_CFLAGS) -Os -g \
 	-fno-delete-null-pointer-checks -fno-stack-protector \
 	-fexec-charset=IBM1047 -m64 -mpacked-stack \
 	-mstack-size=4096 -mstack-guard=128 -msoft-float \
-	-Wall -Wformat-security -Wextra -Werror \
+	-Wall -Wformat-security -Wextra \
 	-Wno-array-bounds

 FILES := stage3a.bin stage3b.bin stage3b_reloc.bin
--- a/genprotimg/src/Makefile
+++ b/genprotimg/src/Makefile
@@ -17,7 +17,7 @@ WARNINGS := -Wall -Wextra -Wshadow \
 	-Wcast-align -Wwrite-strings -Wmissing-prototypes \
 	-Wmissing-declarations -Wredundant-decls -Wnested-externs \
 	-Wno-long-long -Wuninitialized -Wconversion -Wstrict-prototypes \
-	-Wpointer-arith -Werror -Wno-error=inline \
+	-Wpointer-arith -Wno-error=inline \
 	$(NULL)

 $(bin_PROGRAM)_SRCS := $(bin_PROGRAM).c pv/pv_stage3.c pv/pv_image.c \
@@ -36,21 +36,12 @@ ALL_CPPFLAGS += $(INCLUDE_PARMS)
 LDLIBS += $(GLIB2_LIBS) $(LIBCRYPTO_LIBS) $(LIBCURL_LIBS)


-ifneq ($(shell sh -c 'command -v pkg-config'),)
-GLIB2_CFLAGS := $(shell pkg-config --silence-errors --cflags glib-2.0)
-GLIB2_LIBS := $(shell pkg-config --silence-errors --libs glib-2.0)
-LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto)
-LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto)
-LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl)
-LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl)
-else
-GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-GLIB2_LIBS := -lglib-2.0
-LIBCRYPTO_CFLAGS :=
-LIBCRYPTO_LIBS := -lcrypto
-LIBCURL_CFLAGS :=
-LIBCURL_LIBS := -lcurl
-endif
+GLIB2_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags glib-2.0)
+GLIB2_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs glib-2.0)
+LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcrypto)
+LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcrypto)
+LIBCURL_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcurl)
+LIBCURL_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcurl)

 BUILD_TARGETS := skip-$(bin_PROGRAM)
 INSTALL_TARGETS := skip-$(bin_PROGRAM)
--- a/hmcdrvfs/Makefile
+++ b/hmcdrvfs/Makefile
@@ -19,13 +19,8 @@ check_dep:
 		"fuse3-devel or libfuse3-dev", \
 		"HAVE_FUSE=0")

-ifneq ($(shell sh -c 'command -v pkg-config'),)
-FUSE_CFLAGS = $(shell pkg-config --silence-errors --cflags fuse3)
-FUSE_LDLIBS = $(shell pkg-config --silence-errors --libs fuse3)
-else
-FUSE_CFLAGS = -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse3
-FUSE_LDLIBS = -lfuse3
-endif
+FUSE_CFLAGS = $(shell $(PKG_CONFIG) --silence-errors --cflags fuse3)
+FUSE_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs fuse3)
 ALL_CFLAGS += -DFUSE_USE_VERSION=30 -D_LARGEFILE_SOURCE $(FUSE_CFLAGS)
 LDLIBS += $(FUSE_LDLIBS) -lpthread -lrt -ldl -lm

--- a/hsavmcore/Makefile
+++ b/hsavmcore/Makefile
@@ -22,26 +22,16 @@ else # HAVE_FUSE
 #
 # FUSE
 #
-ifneq ($(shell sh -c 'command -v pkg-config'),)
-  FUSE_CFLAGS = $(shell pkg-config --silence-errors --cflags fuse3)
-  FUSE_LDLIBS = $(shell pkg-config --silence-errors --libs fuse3)
-else
-  FUSE_CFLAGS = -I/usr/include/fuse3
-  FUSE_LDLIBS = -lfuse3
-endif
+FUSE_CFLAGS = $(shell $(PKG_CONFIG) --silence-errors --cflags fuse3)
+FUSE_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs fuse3)

 #
 # systemd
 #
 ifneq (${HAVE_SYSTEMD},0)
  ifeq ($(call check_header_prereq,"systemd/sd-daemon.h"),yes)
-    ifneq ($(shell sh -c 'command -v pkg-config'),)
-      SYSTEMD_CFLAGS = $(shell pkg-config --silence-errors --cflags libsystemd)
-      SYSTEMD_LDLIBS = $(shell pkg-config --silence-errors --libs libsystemd)
-    else
-      SYSTEMD_CFLAGS =
-      SYSTEMD_LDLIBS = -lsystemd
-    endif
+    SYSTEMD_CFLAGS = $(shell $(PKG_CONFIG) --silence-errors --cflags libsystemd)
+    SYSTEMD_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs libsystemd)
    ALL_CPPFLAGS += -DHAVE_SYSTEMD
  else
    $(warning "systemd support disabled")
--- a/hyptop/dg_debugfs_lpar.c
+++ b/hyptop/dg_debugfs_lpar.c
@@ -311,6 +311,7 @@ static struct sd_sys_item *l_sys_item_vec[] = {
 static struct sd_sys_item *l_sys_item_enable_vec[] = {
 	&sd_sys_item_core_cnt,
 	&sd_sys_item_core_diff,
+	&sd_sys_item_thread_diff,
 	&sd_sys_item_mgm_diff,
 	&sd_sys_item_core,
 	&sd_sys_item_mgm,
@@ -339,6 +340,7 @@ static struct sd_cpu_item *l_cpu_item_vec[] = {
 static struct sd_cpu_item *l_cpu_item_enable_vec[] = {
 	&sd_cpu_item_type,
 	&sd_cpu_item_core_diff,
+	&sd_cpu_item_thread_diff,
 	&sd_cpu_item_mgm_diff,
 	NULL,
 };
--- a/include/boot/boot_defs.h
+++ b/include/boot/boot_defs.h
@@ -85,7 +85,8 @@ enum blkptr_format_id {
 	 * this is the "new" format which serves only List-Directed IPL,
 	 * but is also suitable for CCW-type IPL.
 	 */
-	BLKPTR_FORMAT_ID
+	BLKPTR_FORMAT_ID,
+	NR_BLKPTR_FORMATS
 };

 /*
--- a/iucvterm/bin/chiucvallow.in
+++ b/iucvterm/bin/chiucvallow.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # z/VM IUCV HVC device driver -- Edit z/VM user ID filter
 #
--- a/libpv/Makefile
+++ b/libpv/Makefile
@@ -5,21 +5,12 @@ include ../common.mak

 LIB := libpv.a

-ifneq ($(shell sh -c 'command -v pkg-config'),)
-GLIB2_CFLAGS := $(shell pkg-config --silence-errors --cflags glib-2.0)
-GLIB2_LIBS := $(shell pkg-config --silence-errors --libs glib-2.0)
-LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto openssl)
-LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto openssl)
-LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl)
-LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl)
-else
-GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-GLIB2_LIBS := -lglib-2.0
-LIBCRYPTO_CFLAGS :=
-LIBCRYPTO_LIBS := -lcrypto -lssl
-LIBCURL_CFLAGS := -I/usr/include/s390x-linux-gnu
-LIBCURL_LIBS := -lcurl
-endif
+GLIB2_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags glib-2.0)
+GLIB2_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs glib-2.0)
+LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcrypto)
+LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcrypto)
+LIBCURL_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcurl)
+LIBCURL_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcurl)
 LDLIBS += $(GLIB2_LIBS) $(LIBCRYPTO_LIBS) $(LIBCURL_LIBS)

 WARNINGS := -Wall -Wextra -Wshadow \
@@ -28,7 +19,6 @@ WARNINGS := -Wall -Wextra -Wshadow \
 	    -Wno-long-long -Wuninitialized -Wconversion -Wstrict-prototypes \
 	    -Wpointer-arith -Wno-error=inline \
 	    -Wno-unused-function -Wno-unused-parameter -Wno-unused-variable \
-	    -Werror \
 	    $(NULL)

 ALL_CFLAGS += -std=gnu11 \
--- a/libseckey/sk_provider.c
+++ b/libseckey/sk_provider.c
@@ -174,6 +174,20 @@ static OSSL_FUNC_keymgmt_settable_params_fn
 					sk_prov_keymgmt_rsa_pss_settable_params;
 static OSSL_FUNC_keymgmt_settable_params_fn
 					sk_prov_keymgmt_ec_settable_params;
+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+static OSSL_FUNC_keymgmt_export_types_ex_fn
+					sk_prov_keymgmt_rsa_export_types_ex;
+static OSSL_FUNC_keymgmt_export_types_ex_fn
+					sk_prov_keymgmt_rsa_pss_export_types_ex;
+static OSSL_FUNC_keymgmt_export_types_ex_fn
+					sk_prov_keymgmt_ec_export_types_ex;
+static OSSL_FUNC_keymgmt_import_types_ex_fn
+					sk_prov_keymgmt_rsa_import_types_ex;
+static OSSL_FUNC_keymgmt_import_types_ex_fn
+					sk_prov_keymgmt_rsa_pss_import_types_ex;
+static OSSL_FUNC_keymgmt_import_types_ex_fn
+					sk_prov_keymgmt_ec_import_types_ex;
+#else
 static OSSL_FUNC_keymgmt_export_types_fn
 					sk_prov_keymgmt_rsa_export_types;
 static OSSL_FUNC_keymgmt_export_types_fn
@@ -185,6 +199,7 @@ static OSSL_FUNC_keymgmt_import_types_fn
 static OSSL_FUNC_keymgmt_import_types_fn
 					sk_prov_keymgmt_rsa_pss_import_types;
 static OSSL_FUNC_keymgmt_import_types_fn	sk_prov_keymgmt_ec_import_types;
+#endif

 static OSSL_FUNC_keyexch_newctx_fn		sk_prov_keyexch_ec_newctx;
 static OSSL_FUNC_keyexch_dupctx_fn		sk_prov_keyexch_ec_dupctx;
@@ -2947,14 +2962,14 @@ static const OSSL_PARAM sk_prov_imexport_types[] = {
 	OSSL_PARAM_END
 };

-static const OSSL_PARAM *sk_prov_keymgmt_export_types(int selection,
-						      int pkey_type)
+static const OSSL_PARAM *sk_prov_keymgmt_export_types(
+						struct sk_prov_ctx *provctx,
+						int selection,
+						int pkey_type)
 {
 	OSSL_FUNC_keymgmt_export_types_fn *default_export_types_fn;
 	const OSSL_PARAM *default_parms = NULL, *params;
-	struct sk_prov_ctx *provctx;

-	provctx = OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
 	if (provctx == NULL)
 		return NULL;

@@ -2982,14 +2997,14 @@ static const OSSL_PARAM *sk_prov_keymgmt_export_types(int selection,
 					   sk_prov_imexport_types);
 }

-static const OSSL_PARAM *sk_prov_keymgmt_import_types(int selection,
-						      int pkey_type)
+static const OSSL_PARAM *sk_prov_keymgmt_import_types(
+						struct sk_prov_ctx *provctx,
+						int selection,
+						int pkey_type)
 {
 	OSSL_FUNC_keymgmt_import_types_fn *default_import_types_fn;
 	const OSSL_PARAM *default_parms = NULL, *params;
-	struct sk_prov_ctx *provctx;

-	provctx = OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
 	if (provctx == NULL)
 		return NULL;

@@ -3337,15 +3352,39 @@ static const OSSL_PARAM *sk_prov_keymgmt_rsa_settable_params(void *vprovctx)
 	return sk_prov_keymgmt_settable_params(provctx, EVP_PKEY_RSA);
 }

+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+static const OSSL_PARAM *sk_prov_keymgmt_rsa_export_types_ex(void *vprovctx,
+							     int selection)
+{
+	struct sk_prov_ctx *provctx = vprovctx;
+
+	return sk_prov_keymgmt_export_types(provctx, selection, EVP_PKEY_RSA);
+}
+
+static const OSSL_PARAM *sk_prov_keymgmt_rsa_import_types_ex(void *vprovctx,
+							     int selection)
+{
+	struct sk_prov_ctx *provctx = vprovctx;
+
+	return sk_prov_keymgmt_import_types(provctx, selection, EVP_PKEY_RSA);
+}
+#else
 static const OSSL_PARAM *sk_prov_keymgmt_rsa_export_types(int selection)
 {
-	return sk_prov_keymgmt_export_types(selection, EVP_PKEY_RSA);
+	struct sk_prov_ctx *provctx =
+		OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
+
+	return sk_prov_keymgmt_export_types(provctx, selection, EVP_PKEY_RSA);
 }

 static const OSSL_PARAM *sk_prov_keymgmt_rsa_import_types(int selection)
 {
-	return sk_prov_keymgmt_import_types(selection, EVP_PKEY_RSA);
+	struct sk_prov_ctx *provctx =
+		OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
+
+	return sk_prov_keymgmt_import_types(provctx, selection, EVP_PKEY_RSA);
 }
+#endif

 static void *sk_prov_keymgmt_rsa_gen_init(void *vprovctx, int selection,
 					  const OSSL_PARAM params[])
@@ -3407,15 +3446,43 @@ static const OSSL_PARAM *sk_prov_keymgmt_rsa_pss_settable_params(void *vprovctx)
 	return sk_prov_keymgmt_settable_params(provctx, EVP_PKEY_RSA_PSS);
 }

+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+static const OSSL_PARAM *sk_prov_keymgmt_rsa_pss_export_types_ex(void *vprovctx,
+								 int selection)
+{
+	struct sk_prov_ctx *provctx = vprovctx;
+
+	return sk_prov_keymgmt_export_types(provctx, selection,
+					    EVP_PKEY_RSA_PSS);
+}
+
+static const OSSL_PARAM *sk_prov_keymgmt_rsa_pss_import_types_ex(void *vprovctx,
+								 int selection)
+{
+	struct sk_prov_ctx *provctx = vprovctx;
+
+	return sk_prov_keymgmt_import_types(provctx, selection,
+					    EVP_PKEY_RSA_PSS);
+}
+#else
 static const OSSL_PARAM *sk_prov_keymgmt_rsa_pss_export_types(int selection)
 {
-	return sk_prov_keymgmt_export_types(selection, EVP_PKEY_RSA_PSS);
+	struct sk_prov_ctx *provctx =
+		OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
+
+	return sk_prov_keymgmt_export_types(provctx, selection,
+					    EVP_PKEY_RSA_PSS);
 }

 static const OSSL_PARAM *sk_prov_keymgmt_rsa_pss_import_types(int selection)
 {
-	return sk_prov_keymgmt_import_types(selection, EVP_PKEY_RSA_PSS);
+	struct sk_prov_ctx *provctx =
+		OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
+
+	return sk_prov_keymgmt_import_types(provctx, selection,
+					    EVP_PKEY_RSA_PSS);
 }
+#endif

 static void *sk_prov_keymgmt_rsa_pss_gen_init(void *vprovctx, int selection,
 					      const OSSL_PARAM params[])
@@ -3490,15 +3557,39 @@ static const OSSL_PARAM *sk_prov_keymgmt_ec_settable_params(void *vprovctx)
 	return sk_prov_keymgmt_settable_params(provctx, EVP_PKEY_EC);
 }

+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+static const OSSL_PARAM *sk_prov_keymgmt_ec_export_types_ex(void *vprovctx,
+							    int selection)
+{
+	struct sk_prov_ctx *provctx = vprovctx;
+
+	return sk_prov_keymgmt_export_types(provctx, selection, EVP_PKEY_EC);
+}
+
+static const OSSL_PARAM *sk_prov_keymgmt_ec_import_types_ex(void *vprovctx,
+							    int selection)
+{
+	struct sk_prov_ctx *provctx = vprovctx;
+
+	return sk_prov_keymgmt_import_types(provctx, selection, EVP_PKEY_EC);
+}
+#else
 static const OSSL_PARAM *sk_prov_keymgmt_ec_export_types(int selection)
 {
-	return sk_prov_keymgmt_export_types(selection, EVP_PKEY_EC);
+	struct sk_prov_ctx *provctx =
+		OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
+
+	return sk_prov_keymgmt_export_types(provctx, selection, EVP_PKEY_EC);
 }

 static const OSSL_PARAM *sk_prov_keymgmt_ec_import_types(int selection)
 {
-	return sk_prov_keymgmt_import_types(selection, EVP_PKEY_EC);
+	struct sk_prov_ctx *provctx =
+		OSSL_PROVIDER_get0_provider_ctx(sk_prov_securekey_provider);
+
+	return sk_prov_keymgmt_import_types(provctx, selection, EVP_PKEY_EC);
 }
+#endif

 static void *sk_prov_keymgmt_ec_gen_init(void *vprovctx, int selection,
 					 const OSSL_PARAM params[])
@@ -4648,11 +4739,21 @@ static const OSSL_DISPATCH sk_prov_rsa_keymgmt_functions[] = {

 	/* Import and export routines */
 	{ OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))sk_prov_keymgmt_export },
+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+	{ OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX,
+			(void (*)(void))sk_prov_keymgmt_rsa_export_types_ex },
+#else
 	{ OSSL_FUNC_KEYMGMT_EXPORT_TYPES,
 			(void (*)(void))sk_prov_keymgmt_rsa_export_types },
+#endif
 	{ OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))sk_prov_keymgmt_import },
+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+	{ OSSL_FUNC_KEYMGMT_IMPORT_TYPES_EX,
+			(void (*)(void))sk_prov_keymgmt_rsa_import_types_ex },
+#else
 	{ OSSL_FUNC_KEYMGMT_IMPORT_TYPES,
 			(void (*)(void))sk_prov_keymgmt_rsa_import_types },
+#endif
 	/* No copy function, OpenSSL will use export/import to copy instead */

 	{ 0, NULL }
@@ -4697,11 +4798,21 @@ static const OSSL_DISPATCH sk_prov_rsapss_keymgmt_functions[] = {

 	/* Import and export routines */
 	{ OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))sk_prov_keymgmt_export },
+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+	{ OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX,
+		(void (*)(void))sk_prov_keymgmt_rsa_pss_export_types_ex },
+#else
 	{ OSSL_FUNC_KEYMGMT_EXPORT_TYPES,
 			(void (*)(void))sk_prov_keymgmt_rsa_pss_export_types },
+#endif
 	{ OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))sk_prov_keymgmt_import },
+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+	{ OSSL_FUNC_KEYMGMT_IMPORT_TYPES_EX,
+		(void (*)(void))sk_prov_keymgmt_rsa_pss_import_types_ex },
+#else
 	{ OSSL_FUNC_KEYMGMT_IMPORT_TYPES,
 			(void (*)(void))sk_prov_keymgmt_rsa_pss_import_types },
+#endif
 	/* No copy function, OpenSSL will use export/import to copy instead */

 	{ 0, NULL }
@@ -4746,11 +4857,21 @@ static const OSSL_DISPATCH sk_prov_ec_keymgmt_functions[] = {

 	/* Import and export routines */
 	{ OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))sk_prov_keymgmt_export },
+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+	{ OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX,
+			(void (*)(void))sk_prov_keymgmt_ec_export_types_ex },
+#else
 	{ OSSL_FUNC_KEYMGMT_EXPORT_TYPES,
 			(void (*)(void))sk_prov_keymgmt_ec_export_types },
+#endif
 	{ OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))sk_prov_keymgmt_import },
+#ifdef OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX
+	{ OSSL_FUNC_KEYMGMT_IMPORT_TYPES_EX,
+			(void (*)(void))sk_prov_keymgmt_ec_import_types_ex },
+#else
 	{ OSSL_FUNC_KEYMGMT_IMPORT_TYPES,
 			(void (*)(void))sk_prov_keymgmt_ec_import_types },
+#endif
 	/* No copy function, OpenSSL will use export/import to copy instead */

 	{ 0, NULL }
--- a/libseckey/sk_utilities.c
+++ b/libseckey/sk_utilities.c
@@ -776,6 +776,10 @@ int SK_UTIL_build_ecdsa_signature(const unsigned char *raw_sig,
 	bn_s = NULL;

 	der_len = i2d_ECDSA_SIG(ec_sig, NULL);
+	if (der_len <= 0) {
+		rc = -EIO;
+		goto out;
+	}

 	if (sig == NULL) {
 		*sig_len = der_len;
@@ -788,13 +792,14 @@ int SK_UTIL_build_ecdsa_signature(const unsigned char *raw_sig,

 	memset(sig, 0, *sig_len);
 	der = sig;
-	*sig_len = i2d_ECDSA_SIG(ec_sig, &der);
-
-	if (*sig_len == 0) {
+	der_len = i2d_ECDSA_SIG(ec_sig, &der);
+	if (der_len <= 0) {
 		rc = -EIO;
 		goto out;
 	}

+	*sig_len = der_len;
+
 out:
 	if (ec_sig != NULL)
 		ECDSA_SIG_free(ec_sig);
--- a/pvattest/src/Makefile
+++ b/pvattest/src/Makefile
@@ -17,7 +17,6 @@ WARNINGS := -Wall -Wextra -Wshadow \
 	    -Wno-long-long -Wuninitialized -Wconversion -Wstrict-prototypes \
 	    -Wpointer-arith -Wno-error=inline \
 	    -Wno-unused-function -Wno-unused-parameter -Wno-unused-variable \
-	    -Werror \
 	    $(NULL)

 PVATTEST_SRCS := $(wildcard *.c) \
@@ -29,21 +28,12 @@ $(BIN_PROGRAM)_SRCS := \

 $(BIN_PROGRAM)_OBJS := $($(BIN_PROGRAM)_SRCS:.c=.o)

-ifneq ($(shell sh -c 'command -v pkg-config'),)
-GLIB2_CFLAGS := $(shell pkg-config --silence-errors --cflags glib-2.0)
-GLIB2_LIBS := $(shell pkg-config --silence-errors --libs glib-2.0)
-LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto openssl)
-LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto openssl)
-LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl)
-LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl)
-else
-GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-GLIB2_LIBS := -lglib-2.0
-LIBCRYPTO_CFLAGS :=
-LIBCRYPTO_LIBS := -lcrypto -lssl
-LIBCURL_CFLAGS := -I/usr/include/s390x-linux-gnu
-LIBCURL_LIBS := -lcurl
-endif
+GLIB2_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags glib-2.0)
+GLIB2_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs glib-2.0)
+LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcrypto)
+LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcrypto)
+LIBCURL_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcurl)
+LIBCURL_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcurl)

 ALL_CFLAGS += -std=gnu11 \
 	      -DPKGDATADIR=$(PKGDATADIR) \
--- a/pvattest/tools/pvattest-info
+++ b/pvattest/tools/pvattest-info
@@ -14,7 +14,7 @@ set -o pipefail
 set -o nounset
 set -e

-XDUMP='od -A x -t x2z -v'
+XDUMP='od -A x -t x2z -v --endian=big'

 usage() {
 	cat <<-EOF
--- a/pvattest/tools/pvextract-hdr
+++ b/pvattest/tools/pvextract-hdr
@@ -14,7 +14,7 @@ set -o pipefail
 set -o nounset
 set -e

-XDUMP='od -A x -t x2z -v'
+XDUMP='od -A x -t x2z -v --endian=big'

 def_output='sehdr.bin'
 def_skip=0x14
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -0,0 +1 @@
+/.zfcpdbf.ct
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -36,4 +36,21 @@ install:

 clean:

+.zfcpdbf.ct: zfcpdbf
+	$(PERLC) $(ALL_PERLCFLAGS) zfcpdbf 2>$(@);			\
+	if [ "$${?}" -ne 0 ]; then					\
+		cat "$(@)" >&2 && rm "$(@)";				\
+	elif [ "$$(cat '$(@)' | wc -l)" -gt 1 ]; then			\
+		cat "$(@)" >&2;						\
+	elif [ " $(V)" = " 1" ]; then					\
+		cat "$(@)";						\
+	fi
+
+.PHONY: .zfcpdbf.ct-clean
+.zfcpdbf.ct-clean:
+	rm -f .zfcpdbf.ct
+
+all: .zfcpdbf.ct
+clean: .zfcpdbf.ct-clean
+
 .PHONY: all install clean
--- a/scripts/dbginfo.sh
+++ b/scripts/dbginfo.sh
@@ -409,6 +409,7 @@ CONFIGFILES="\
  /etc/multipath\
  /etc/network\
  /etc/networks\
+  /etc/opencryptoki/*.conf\
  /etc/pam.d\
  /etc/profile\
  /etc/profile.d\
@@ -513,13 +514,20 @@ CMDS="${CMDS}\

 # crypto specific commands
 CMDS="${CMDS}\
-  :cat /var/lib/opencryptoki/pk_config_data\
+  :ep11info -D\
+  :ep11info -H\
+  :ep11info -M\
  :icainfo\
-  :icastats\
+  :icastats --all\
  :ivp.e # IBM CCA package install check\
  :ls -al /usr/lib64/opencryptoki/stdll\
  :lszcrypt -VV\
-  :pkcsconf -mlist\
+  :pkcsconf -i\
+  :pkcsconf -s\
+  :pkcsconf -l\
+  :pkcsconf -t\
+  :pkcsconf -m\
+  :systemctl status pkcsslotd\
  "

 # product / distro specific commands
@@ -567,6 +575,7 @@ NETWORK_CMDS="ip -br a\
  :netstat -pantu\
  :netstat -s\
  :nm-tool\
+  :nstat -az\
  :openssl engine\
  :route -n\
  "
--- a/scripts/dumpconf
+++ b/scripts/dumpconf
@@ -301,6 +301,9 @@ setup_reipl()
 	fi

 	case "$REIPL_TYPE" in
+		eckd)
+			setup_ccw_device $REIPL_CONFIG_DIR $REIPL_TYPE
+			;;
 		ccw)
 			setup_ccw_device $REIPL_CONFIG_DIR $REIPL_TYPE
 			;;
@@ -332,6 +335,9 @@ setup_reipl()
 setup_dump()
 {
 	case "$DUMP_TYPE" in
+		eckd)
+			setup_ccw_device $DUMP_CONFIG_DIR $DUMP_TYPE
+			;;
 		ccw)
 			setup_ccw_device $DUMP_CONFIG_DIR $DUMP_TYPE
 			;;
@@ -408,6 +414,16 @@ print_ccw_device()
 	pr_info "device..: $DEVICE"
 }

+print_eckd_device()
+{
+	DEVICE=$(cat $1/eckd/device) || RETVAL=1
+	pr_info "device..: $DEVICE"
+	BR_CHR=$(cat $1/eckd/br_chr) || RETVAL=1
+	pr_info "br_chr..: $BR_CHR"
+	BOOTPROG=$(cat $1/eckd/bootprog) || RETVAL=1
+	pr_info "bootprog: $BOOTPROG"
+}
+
 print_nvme_device()
 {
 	FID=$(cat $1/nvme/fid) || RETVAL=1
@@ -433,6 +449,11 @@ status_dump()
 		none)
 			pr_info "type....: no dump device configured"
 			;;
+		eckd)
+			pr_info "type....: eckd"
+			print_eckd_device $DUMP_CONFIG_DIR
+			verify_ccw_dump_device $(cat $DUMP_CONFIG_DIR/eckd/device)
+			;;
 		ccw)
 			pr_info "type....: ccw"
 			print_ccw_device $DUMP_CONFIG_DIR
@@ -458,6 +479,9 @@ status_reipl()
 	REIPL_TYPE=$(cat $REIPL_CONFIG_DIR/reipl_type) || RETVAL=1
 	pr_info "type....: $REIPL_TYPE"
 	case "$REIPL_TYPE" in
+		eckd)
+			print_eckd_device $REIPL_CONFIG_DIR
+			;;
 		ccw)
 			print_ccw_device $REIPL_CONFIG_DIR
 			;;
--- a/zconf/Makefile
+++ b/zconf/Makefile
@@ -59,7 +59,7 @@ endif

 $(SUB_DIRS):
 	$(foreach goal,$(MAKECMDGOALS), \
-		$(MAKE) -C $@ TOPDIR=$(TOPDIR) ARCH=$(ARCH) $(goal) ;)
+		$(MAKE) -C $@ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) $(goal) ;)
 .PHONY: $(SUB_DIRS)

 .PHONY: all install clean install-scripts install-manpages install-usrsbin-scripts
--- a/zconf/zcrypt/lszcrypt.c
+++ b/zconf/zcrypt/lszcrypt.c
@@ -614,6 +614,8 @@ static void read_subdev_rec_verbose(struct util_rec *rec, const char *grp_dev,
 static void show_subdevice(struct util_rec *rec, const char *grp_dev,
 			   const char *sub_dev)
 {
+	char type[16], t = '\0';
+
 	if (!util_path_is_dir("%s/%s", grp_dev, sub_dev))
 		errx(EXIT_FAILURE, "Error - cryptographic device %s/%s does not exist.", grp_dev, sub_dev);

@@ -630,6 +632,14 @@ static void show_subdevice(struct util_rec *rec, const char *grp_dev,
 		return;

 	util_rec_set(rec, "card", sub_dev);
+	if (util_file_read_line(type, sizeof(type), "%s/type", grp_dev) == 0)
+		t = type[strlen(type) - 1];
+
+	if ((t == 'A' && !l.showaccel) ||
+	    (t == 'C' && !l.showcca) ||
+	    (t == 'P' && !l.showep11))
+		return;
+
 	read_subdev_rec_default(rec, grp_dev, sub_dev);
 	read_subdev_rec_verbose(rec, grp_dev, sub_dev);

@@ -843,12 +853,12 @@ static void show_devices_all(void)
 /*
 * Show devices specified on commandline
 */
-static void show_devices_argv(char *argv[])
+static void show_devices_argv(int argc, char **argv)
 {
+	int id, dom, argidx, devidx, n, dev_cnt, sub_cnt;
 	struct util_rec *rec = util_rec_new_wide("-");
-	struct dirent **dev_vec, **subdev_vec;
 	char *ap, *grp_dev, *path, *card, *sub_dev;
-	int id, dom, i, n, dev_cnt, sub_cnt;
+	struct dirent **dev_vec, **subdev_vec;

 	/* check if ap driver is available */
 	ap = util_path_sysfs("bus/ap");
@@ -860,10 +870,10 @@ static void show_devices_argv(char *argv[])
 	define_rec_verbose(rec);

 	util_rec_print_hdr(rec);
-	for (i = 0; argv[i] != NULL; i++) {
+	for (argidx = 0; argidx < argc; argidx++) {
 		id = -1;
 		dom = -1;
-		if (sscanf(argv[i], "%x.%x", &id, &dom) >= 1) {
+		if (sscanf(argv[argidx], "%x.%x", &id, &dom) >= 1) {
 			/* at least the id field was valid */
 			if (id >= 0 && dom >= 0) {	/* single subdevice */
 				util_asprintf(&sub_dev, "%02x.%04x", id, dom);
@@ -879,7 +889,7 @@ static void show_devices_argv(char *argv[])
 			}
 			continue;
 		}
-		if (sscanf(argv[i]+1, "%x", &dom) == 1) {
+		if (sscanf(argv[argidx] + 1, "%x", &dom) == 1) {
 			/* list specific domains of all adapters */
 			path = util_path_sysfs("devices/ap/");
 			dev_cnt = util_scandir(&dev_vec, alphasort, path,
@@ -887,9 +897,9 @@ static void show_devices_argv(char *argv[])
 			if (dev_cnt < 1)
 				errx(EXIT_FAILURE, "No crypto card devices found.");
 			free(path);
-			for (i = 0; i < dev_cnt; i++) {
+			for (devidx = 0; devidx < dev_cnt; devidx++) {
 				path = util_path_sysfs("devices/ap/%s",
-						       dev_vec[i]->d_name);
+						       dev_vec[devidx]->d_name);
 				sub_cnt = util_scandir(&subdev_vec, alphasort,
 						       path,
 						       "[0-9a-fA-F]+.%04x",
@@ -1013,6 +1023,6 @@ int main(int argc, char **argv)
 	if (optind == argc)
 		show_devices_all();
 	else
-		show_devices_argv(&argv[optind]);
+		show_devices_argv((argc - optind), &argv[optind]);
 	return EXIT_SUCCESS;
 }
--- a/zdev/dracut/95zdev-kdump/module-setup.sh
+++ b/zdev/dracut/95zdev-kdump/module-setup.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+#
+# Copyright IBM Corp. 2023
+#
+# s390-tools is free software; you can redistribute it and/or modify
+# it under the terms of the MIT license. See LICENSE for details.
+#
+#
+# 95zdev-kdump/module_setup.sh
+#   This module installs configuration files (udev rules and modprobe.conf
+#   files) required to enable the kdump target on s390.
+#
+
+# called by dracut
+check() {
+    local _arch=${DRACUT_ARCH:-$(uname -m)}
+
+    # Ensure that we're running on s390
+    [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
+
+    source "$moddir/../95zdev/zdev-lib.sh"
+
+    # Ensure this module is only included when building kdump initrd
+    is_kdump || return 1
+
+    # Ensure that required tools are available
+    require_binaries chzdev || return 1
+
+    return 0
+}
+
+# called by dracut
+depends() {
+    return 0
+}
+
+# called by dracut
+installkernel() {
+    # Add modules for all device types supported by chzdev (required for
+    # auto-configuration)
+    instmods ctcm lcs qeth qeth_l2 qeth_l3 dasd_mod dasd_eckd_mod dasd_fba_mod \
+             dasd_diag_mod zfcp
+}
+
+# called by dracut
+install() {
+    local _tempfile
+
+    # Obtain kdump target device configuration
+
+    _tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
+
+    # work with systems that are not based on chzdev persistent config
+    local _configuration="--active"
+    # disable zfcp auto LUN scan to prevent OOM situations on systems with
+    # many zFCP LUNs
+    inst_dir /etc/modprobe.d
+    chzdev zfcp --type "allow_lun_scan=0" --persistent \
+           --base "/etc=$initdir/etc" --yes --quiet --no-root-update \
+           --force >/dev/null
+    # drop /etc/zfcp.conf from dracut module 95zfcp
+    echo "rd.zfcp.conf=0" > "$initdir/etc/cmdline.d/00-no-zfcp-conf.conf"
+    # => only activate individual zfcp paths found as required below
+
+    function check_zdev() {
+        local _dev=$1
+        local _devsysfs _bdevpath
+        _devsysfs=$(
+            cd -P /sys/dev/block/"$_dev" && echo "$PWD"
+                 )
+        _bdevpath=/dev/${_devsysfs##*/}
+        # do not export device type information potentially unknown on import
+        chzdev --export - "$_configuration" --by-node "$_bdevpath" --quiet \
+               2>/dev/null >> "$_tempfile"
+    }
+    for_each_host_dev_and_slaves_all check_zdev
+    sed -i -e 's/^\[active /\[persistent /' "$_tempfile"
+
+    # Apply via --import to prevent other devices from being configured
+    chzdev --import "$_tempfile" --persistent --base "/etc=$initdir/etc" \
+           --yes --quiet --no-root-update --force >/dev/null
+
+    rm -f "$_tempfile"
+
+    # these are purely generated udev rules so we have to glob expand
+    # within $initdir and strip the $initdir prefix for mark_hostonly
+    local -a _array
+    local _nullglob=$(shopt -p nullglob)
+    shopt -u nullglob
+    readarray -t _array < \
+	      <(ls -1 $initdir/etc/udev/rules.d/41-*.rules 2> /dev/null)
+    [[ ${#_array[@]} -gt 0 ]] && mark_hostonly "${_array[@]#$initdir}"
+    readarray -t _array < \
+	      <(ls -1 $initdir/etc/modprobe.d/s390x-*.conf 2> /dev/null)
+    [[ ${#_array[@]} -gt 0 ]] && mark_hostonly "${_array[@]#$initdir}"
+    $_nullglob
+
+    return 0
+}
--- a/zdev/dracut/95zdev/module-setup.sh
+++ b/zdev/dracut/95zdev/module-setup.sh
@@ -19,6 +19,12 @@ check() {
    # Ensure that we're running on s390
    [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1

+    source "$moddir/zdev-lib.sh"
+
+    # Leave kdump device configuration to module zdev-kdump to
+    # ensure a minimal device footprint
+    is_kdump && return 1
+
    # Ensure that required tools are available
    require_binaries chzdev lszdev /lib/s390-tools/zdev_id || return 1

@@ -50,8 +56,18 @@ install() {

    # Obtain early + root device configuration
    _tempfile=$(mktemp --tmpdir dracut-zdev.XXXXXX)
-    chzdev --export "$_tempfile" --persistent --by-path / --quiet \
-	   --type 2>/dev/null
+    function check_zdev() {
+        local _dev=$1
+        local _devsysfs _bdevpath
+        _devsysfs=$(
+            cd -P /sys/dev/block/"$_dev" && echo "$PWD"
+                 )
+        _bdevpath=/dev/${_devsysfs##*/}
+        chzdev --export - --persistent --by-node "$_bdevpath" --quiet \
+               --type 2>/dev/null >> "$_tempfile"
+    }
+    for_each_host_dev_and_slaves_all check_zdev
+
    chzdev --export - --persistent --by-attrib "zdev:early=1" --quiet \
 	   --type 2>/dev/null >> "$_tempfile"

--- a/zdev/dracut/95zdev/zdev-lib.sh
+++ b/zdev/dracut/95zdev/zdev-lib.sh
@@ -0,0 +1,24 @@
+#
+# Copyright IBM Corp. 2023
+#
+# s390-tools is free software; you can redistribute it and/or modify
+# it under the terms of the MIT license. See LICENSE for details.
+#
+#
+# 95zdev/zdev-lib.sh
+#   Common shell library functionality for 95zdev and 95zdev-kdump.
+#
+
+is_kdump() {
+    # https://src.fedoraproject.org/rpms/kexec-tools/c/4eedcae5e1540690a3761857fe2e692774c44960
+    # https://src.fedoraproject.org/rpms/kexec-tools/blob/rawhide/f/mkdumprd
+    # https://src.fedoraproject.org/rpms/kexec-tools/blob/rawhide/f/dracut-module-setup.sh
+    if [[ $hostonly && "$hostonly_mode" == "strict" && -n "$IN_KDUMP" ]]; then
+        return 0
+    fi
+    # https://github.com/openSUSE/kdump/blob/master/dracut/module-setup.sh
+    if [[ " $dracutmodules $add_dracutmodules $force_add_dracutmodules " == *\ kdump\ * ]]; then
+        return 0
+    fi
+    return 1
+}
--- a/zdev/dracut/Makefile
+++ b/zdev/dracut/Makefile
@@ -2,6 +2,7 @@
 include ../../common.mak

 ZDEVDIR := 95zdev
+ZDEVKDUMPDIR := 95zdev-kdump

 # HAVE_DRACUT
 #
@@ -19,5 +20,9 @@ install:
 	$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVDIR)
 	$(INSTALL) -m 755 $(ZDEVDIR)/module-setup.sh \
 		$(ZDEVDIR)/parse-zdev.sh \
+		$(ZDEVDIR)/zdev-lib.sh \
 		$(DESTDIR)$(DRACUTMODDIR)/$(ZDEVDIR)/
+	$(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVKDUMPDIR)
+	$(INSTALL) -m 755 $(ZDEVKDUMPDIR)/module-setup.sh \
+		$(DESTDIR)$(DRACUTMODDIR)/$(ZDEVKDUMPDIR)/
 endif
--- a/zdsfs/Makefile
+++ b/zdsfs/Makefile
@@ -39,17 +39,10 @@ check_dep:
 		"curl-devel or libcurl-dev", \
 		"HAVE_CURL=0")

-ifneq ($(shell sh -c 'command -v pkg-config'),)
-FUSE_CFLAGS = $(shell pkg-config --silence-errors --cflags fuse3)
-FUSE_LDLIBS = $(shell pkg-config --silence-errors --libs fuse3)
-CURL_CFLAGS = $(shell pkg-config --silence-errors --cflags libcurl)
-CURL_LDLIBS = $(shell pkg-config --silence-errors --libs libcurl)
-else
-FUSE_CFLAGS = -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse3
-FUSE_LDLIBS = -lfuse3
-CURL_CFLAGS = -I/usr/include/s390x-linux-gnu/curl
-CURL_LDLIBS = -lcurl
-endif
+FUSE_CFLAGS = $(shell $(PKG_CONFIG) --silence-errors --cflags fuse3)
+FUSE_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs fuse3)
+CURL_CFLAGS = $(shell $(PKG_CONFIG) --silence-errors --cflags libcurl)
+CURL_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs libcurl)
 ALL_CPPFLAGS += -DSYSFS
 ALL_CFLAGS += -DHAVE_SETXATTR -pthread $(FUSE_CFLAGS) $(CURL_CFLAGS)
 LDLIBS += $(FUSE_LDLIBS) $(CURL_LDLIBS) -lpthread -lrt -lm
--- a/zdump/Makefile
+++ b/zdump/Makefile
@@ -79,17 +79,10 @@ OBJECTS = zgetdump.o opts.o zg.o zg_error.o zg_print.o \
 	  ngdump.o dt_ngdump.o dfi_ngdump.o dfi_vmdump.o \
 	  pv_utils.o

-ifneq ($(shell sh -c 'command -v pkg-config'),)
-GLIB2_CFLAGS := $(shell pkg-config --silence-errors --cflags glib-2.0)
-GLIB2_LIBS := $(shell pkg-config --silence-errors --libs glib-2.0)
-LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto)
-LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto)
-else
-GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-GLIB2_LIBS := -lglib-2.0
-LIBCRYPTO_CFLAGS :=
-LIBCRYPTO_LIBS := -lcrypto
-endif
+GLIB2_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags glib-2.0)
+GLIB2_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs glib-2.0)
+LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --silence-errors --cflags libcrypto)
+LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --silence-errors --libs libcrypto)

 LIBPV = $(rootdir)/libpv/libpv.a
 LIBPV_CFLAGS := -DOPENSSL_API_COMPAT=0x10100000L \
@@ -101,12 +94,9 @@ LIBPV_LIBS := $(GLIB2_LIBS) $(LIBCRYPTO_LIBS)
 ifeq ("$(HAVE_FUSE)","0")
 FUSE_CFLAGS = -DHAVE_FUSE=0 -D_FILE_OFFSET_BITS=64
 FUSE_LDLIBS =
-else ifneq ($(shell sh -c 'command -v pkg-config'),)
-FUSE_CFLAGS = -DHAVE_FUSE=1 $(shell pkg-config --silence-errors --cflags fuse3)
-FUSE_LDLIBS = $(shell pkg-config --silence-errors --libs fuse3)
 else
-FUSE_CFLAGS = -DHAVE_FUSE=1 -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse3
-FUSE_LDLIBS = -lfuse3
+FUSE_CFLAGS = -DHAVE_FUSE=1 $(shell $(PKG_CONFIG) --silence-errors --cflags fuse3)
+FUSE_LDLIBS = $(shell $(PKG_CONFIG) --silence-errors --libs fuse3)
 endif
 LDLIBS += -lz $(FUSE_LDLIBS) $(LIBPV_LIBS)
 ALL_CFLAGS += $(FUSE_CFLAGS) $(LIBPV_CFLAGS)
--- a/zfcpdump/Makefile
+++ b/zfcpdump/Makefile
@@ -27,7 +27,7 @@ check_dep:
 all: check_dep $(ZFCPDUMP_INITRD) scripts

 cpioinit: cpioinit.c
-	$(HOSTCC) $(HOSTCFLAGS) -o $@ $^
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $^

 zfcpdump_part: zfcpdump.o zfcpdump_part.o
 	$(LINK) $(ALL_LDFLAGS) $^ -static -o $@
--- a/ziomon/ziorep_config
+++ b/ziomon/ziorep_config
@@ -123,11 +123,12 @@ sub get_device_data
 			} else {
 				$devices{$hctl}{dev}  = glob_last("block\:sd*");
 			}
+			$devices{$hctl}{sg_mm}   = get_line("generic", "dev");
+			next if !defined $devices{$hctl}{dev};
 			$c_src = $devices{$hctl}{dev};
 			$devices{$hctl}{dev}  =~ s/.*(sd[a-z0-9]+)\Z/$1/
 						unless(!$devices{$hctl}{dev});
 			$devices{$hctl}{mm}   = get_line("dev");
-			$devices{$hctl}{sg_mm}   = get_line("generic", "dev");
 			$devices{$hctl}{mp_dev} = glob_last("holders", "dm*");
 			$devices{$hctl}{mp_dev} =~ s/.*\/(.+)\Z/$1/
 						unless (!$devices{$hctl}{mp_dev});
--- a/zipl/boot/Makefile
+++ b/zipl/boot/Makefile
@@ -10,7 +10,7 @@ ALL_CFLAGS = $(NO_PIE_CFLAGS) -Os -g $(INCLUDE_PARMS) \
 	  -fno-delete-null-pointer-checks -fno-stack-protector \
 	  -fexec-charset=IBM1047 -m64 -mpacked-stack \
 	  -mstack-size=4096 -mstack-guard=128 -msoft-float \
-	  -W -Wall -Wformat-security -fno-sanitize=all
+	  -W -Wall -Wformat-security -fno-sanitize=all -Wno-array-bounds
 ALL_LDFLAGS += -fno-sanitize=all

 FILES	= fba0.bin fba1b.bin fba2.bin \
--- a/zipl/boot/eckd2dump_mv.c
+++ b/zipl/boot/eckd2dump_mv.c
@@ -21,7 +21,7 @@
 /*
 * Magic number at start of dump record
 */
-uint64_t __section(.stage2.head) magic = 0x584d554c54363401ULL; /* XMULT64, version 1 */
+const uint64_t __section(.stage2.head) magic = 0x584d554c54363401ULL; /* XMULT64, version 1 */

 /*
 * Parameter format for ECKD MV dumper (13 bytes):
--- a/zipl/boot/eckd2dump_sv.c
+++ b/zipl/boot/eckd2dump_sv.c
@@ -19,7 +19,7 @@
 /*
 * Magic number at start of dump record
 */
-uint64_t __section(.stage2.head) magic = 0x5845434b44363401ULL; /* "XECKD64", version 1 */
+const uint64_t __section(.stage2.head) magic = 0x5845434b44363401ULL; /* "XECKD64", version 1 */

 /*
 * Get device characteristics from zipl parameter block
--- a/zipl/boot/fba2dump.c
+++ b/zipl/boot/fba2dump.c
@@ -23,7 +23,7 @@
 /*
 * Magic number at start of dump record
 */
-uint64_t __section(.stage2.head) magic = 0x5844464241363401ULL; /* XDFBA64, version 1 */
+const uint64_t __section(.stage2.head) magic = 0x5844464241363401ULL; /* XDFBA64, version 1 */

 /*
 * FBA dump device partition specification
--- a/zipl/boot/stage2.c
+++ b/zipl/boot/stage2.c
@@ -148,4 +148,4 @@ void panic_notify(unsigned long UNUSED(reason))
 {
 }

-uint64_t __section(.stage2.head) stage2_head;
+const uint64_t __section(.stage2.head) stage2_head;
--- a/zipl/boot/tape2dump.c
+++ b/zipl/boot/tape2dump.c
@@ -37,7 +37,7 @@ struct tape_head {
 	uint64_t	ccw2;
 } __packed;

-struct tape_head __section(.stage2.head) tape_head = {
+const struct tape_head __section(.stage2.head) tape_head = {
 	.psw	= PSW_LOAD | STAGE2_ENTRY, /* Start code at 0x2018 */
 	.ccw1	= 0x0700000060000001ULL, /* Rewind ccw */
 	.ccw2	= 0x0200200020003000ULL, /* CCW to load dump tool to 0x2000 */
--- a/zipl/dracut/zipl_helper.prepare-ngdump
+++ b/zipl/dracut/zipl_helper.prepare-ngdump
@@ -16,14 +16,21 @@ DRACUT_OMIT_MODULES=(
 	systemd-timedated systemd-timesyncd
 	systemd-networkd systemd-network-manager systemd-coredump)

-[ $# -gt 0 ] || { echo "Usage: $0 <dump partition device>" >&2; exit 1; }
+function create_dumpfs()
+{
+	[ "$dryrun" -eq 1 ] && { echo "/dev/null"; return 0; }
+	mkfs -F "$device" >/dev/null || { echo "Couldn't create filesystem on $1." >&2; return 1; }
+	local disk_path=/dev/disk/by-uuid/$(blkid -o value -s UUID "$device")
+	for i in $(seq 0 30)
+	do
+		[ -e "$disk_path" ] && break;
+		sleep 1
+	done
+
+	[ -e "$disk_path" ] || { echo "Filesystem device link missing." >&2; return 1; }
+	echo "$disk_path"
+}

-#
-# Retrieve partition UUID
-#
-# We use PARTUUID because zipl re-formats the given partition after
-# calling us, therefore, a UUID will change.
-#
 device=$(readlink -f $1)
 disk_path=/dev/disk/by-partuuid/$(blkid -o value -s PARTUUID "$device")

@@ -69,6 +76,27 @@ function create_initrd()
 	       --kver "$kver" -f "$initrd" 2>&1
 }

+[ $# -gt 1 ] || { echo "Usage: $0 <dump partition device> <dryrun>" >&2; exit 1; }
+
+dasd=
+device=$(readlink -f $1)
+dryrun=$2
+type=$(lsblk -dno type "$device")
+[ "$type" != "part" ] && { echo "$device with type $type is not a partition." >&2; exit 1; }
+
+case "${device##*/}" in
+	dasd*)
+		dasd=$(dasdview -i "$1"|sed -n 's/busid\s*:\s*\([0-9a-fA-F.]\)/dasd=\1/p')
+		;;
+	nvme*)
+		;;
+	*)
+		echo "Unsupported device $device." >&2
+		exit 1
+		;;
+esac
+
+disk_path=$(create_dumpfs $device)
 kernel_version=$(get_kernel_version)
 kernel=$(get_kernel_image "$kernel_version")
 [ -e "$kernel" ] || { echo "Couldn't find kernel image." >&2; exit 1; }
@@ -88,6 +116,6 @@ create_initrd "$disk_path" "$kernel_version" "$initrd"

 echo "kernel=$kernel"
 echo "initrd=$initrd"
-echo "cmdline=reset_devices cgroup_disable=memory nokaslr numa=off irqpoll nr_cpus=1"
+echo "cmdline=reset_devices cgroup_disable=memory nokaslr numa=off irqpoll nr_cpus=1 $dasd"

 exit 0
--- a/zipl/include/disk.h
+++ b/zipl/include/disk.h
@@ -95,13 +95,14 @@ int disk_get_info(const char* device, struct job_target_data* target,
 		  struct disk_info** info);
 int disk_is_tape(const char* device);
 int disk_is_scsi(const char* device, struct job_target_data* target);
+int disk_is_eckd_ldl(const char* device, struct job_target_data* target);
 int disk_is_nvme(const char* device, struct job_target_data* target);
 int disk_get_info_from_file(const char* filename,
 			    struct job_target_data* target,
 			    struct disk_info** info);
 void disk_free_info(struct disk_info* info);
 char* disk_get_type_name(disk_type_t type);
-char *disk_get_ipl_type(disk_type_t type);
+char *disk_get_ipl_type(disk_type_t type, int is_dump);
 int disk_is_large_volume(struct disk_info* info);
 int disk_cyl_from_blocknum(blocknum_t blocknum, struct disk_info* info);
 int disk_head_from_blocknum(blocknum_t blocknum, struct disk_info* info);
--- a/zipl/include/install.h
+++ b/zipl/include/install.h
@@ -17,15 +17,7 @@
 #include "zipl.h"
 #include "boot/boot_defs.h"

-/*
- * For compatibility reasons zIPL can build multiple "similar"
- * program tables, which differ only in block pointers format
- */
-enum program_table_id {
-	PROGRAM_TABLE_0,
-	PROGRAM_TABLE_1,
-	NR_PROGRAM_TABLES
-};
+#define NR_PROGRAM_TABLES NR_BLKPTR_FORMATS

 enum program_component_id {
 	COMPONENT_ID_HEAP_AREA,
@@ -69,7 +61,6 @@ struct program_table {
 struct install_set {
 	struct program_table tables[NR_PROGRAM_TABLES];
 	struct program_component *components[NR_PROGRAM_COMPONENTS];
-	int nr_tables; /* number of "similar" program tables to be installed */
 	int nr_menu_entries;
 	int fd;
 	char *device;
@@ -77,6 +68,8 @@ struct install_set {
 	char *dump_mount_point;
 	unsigned int dump_tmp_dir_created:1;
 	unsigned int dump_mounted:1;
+	unsigned int skip_prepare:1;
+	unsigned int print_details:1;
 	struct disk_info *info;
 	disk_blockptr_t scsi_dump_sb_blockptr;
 };
--- a/zipl/include/job.h
+++ b/zipl/include/job.h
@@ -128,6 +128,7 @@ struct job_data {
 	int dry_run;
 	int command_line;
 	int is_secure;
+	int is_ldipl_dump;
 };


@@ -136,6 +137,6 @@ void job_free(struct job_data* job);
 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);
-bool is_ngdump_enabled(const char* device, struct job_target_data* target);
+bool is_ngdump_enabled(struct job_data *job);

 #endif /* not JOB_H */
--- a/zipl/initramfs-tools/zipl_helper.prepare-ngdump
+++ b/zipl/initramfs-tools/zipl_helper.prepare-ngdump
@@ -6,18 +6,20 @@
 # it under the terms of the MIT license. See LICENSE for details.
 #

-[ $# -gt 0 ] || { echo "Usage: $0 <dump partition device>" >&2; exit 1; }
+function create_dumpfs()
+{
+	[ "$dryrun" -eq 1 ] && { echo "/dev/null"; return 0; }
+	mkfs -F "$device" >/dev/null || { echo "Couldn't create filesystem on $1." >&2; return 1; }
+	local disk_path=/dev/disk/by-uuid/$(blkid -o value -s UUID "$device")
+	for i in $(seq 0 30)
+	do
+		[ -e "$disk_path" ] && break;
+		sleep 1
+	done

-#
-# Retrieve partition UUID
-#
-# We use PARTUUID because zipl re-formats the given partition after
-# calling us, therefore, a UUID will change.
-#
-device=$(readlink -f $1)
-disk_path=/dev/disk/by-partuuid/$(blkid -o value -s PARTUUID "$device")
-
-[ -e "$disk_path" ] || { echo "Couldn't find disk by PARTUUID." >&2; exit 1; }
+	[ -e "$disk_path" ] || { echo "Filesystem device link missing." >&2; return 1; }
+	echo "$disk_path"
+}

 function get_kernel_version()
 {
@@ -49,6 +51,28 @@ function create_initrd()
 	NGDUMP=y NGDUMP_DEVICE="$disk" mkinitramfs -o "$initrd" "$kver" 2>&1
 }

+[ $# -gt 1 ] || { echo "Usage: $0 <dump partition device> <dryrun>" >&2; exit 1; }
+
+device=$(readlink -f $1)
+dryrun=$2
+dasd=
+
+type=$(lsblk -dno type "$device")
+[ "$type" != "part" ] && { echo "$device with type $type is not a partition." >&2; exit 1; }
+
+case "${device##*/}" in
+	dasd*)
+		dasd=$(dasdview -i "$1"|sed -n 's/busid\s*:\s*\([0-9a-fA-F.]\)/dasd=\1/p')
+		;;
+	nvme*)
+		;;
+	*)
+		echo "Unsupported device $device." >&2
+		exit 1
+		;;
+esac
+
+disk_path=$(create_dumpfs $device)
 kernel_version=$(get_kernel_version)
 kernel=$(get_kernel_image "$kernel_version")
 [ -e "$kernel" ] || { echo "Couldn't find kernel image." >&2; exit 1; }
@@ -68,6 +92,6 @@ create_initrd "$disk_path" "$kernel_version" "$initrd"

 echo "kernel=$kernel"
 echo "initrd=$initrd"
-echo "cmdline=reset_devices cgroup_disable=memory nokaslr numa=off irqpoll nr_cpus=1"
+echo "cmdline=reset_devices cgroup_disable=memory nokaslr numa=off irqpoll nr_cpus=1 $dasd"

 exit 0
--- a/zipl/man/zipl.8.in
+++ b/zipl/man/zipl.8.in
@@ -281,6 +281,10 @@ or configuration section on the command line at the same time.
 .BR "\-D" " or " "\-\-dumptofs"
 This option has been removed, use --dumpto instead.

+.TP
+.BR "\-\-ldipl-dump"
+Install a List-directed dump record instead of a CCW-type dump.
+
 .TP
 .BR "\-M <DUMPLIST[,SIZE]>" " or " "--mvdump=<DUMPLIST[,SIZE]>"
 Install a multi-volume dump record on each device associated with one of the
--- a/zipl/src/bootmap.c
+++ b/zipl/src/bootmap.c
@@ -321,7 +321,7 @@ static int add_component_file_range(struct install_set *bis,
 	size_t size;
 	int rc;

-	if (program_table_id)
+	if (bis->skip_prepare)
 		/* skip the preparation work */
 		goto write_segment_table;
 	if (add_files) {
@@ -402,7 +402,7 @@ static int add_component_buffer_align(struct install_set *bis, void *buffer,
 	disk_blockptr_t segment;
 	int rc;

-	if (program_table_id)
+	if (bis->skip_prepare)
 		/* skip the preparation work */
 		goto write_segment_table;
 	/* Write buffer */
@@ -511,9 +511,6 @@ extract_signature(const char *filename, void **ret_signature,
 	memcpy(signature, buffer + size - signature_size - sizeof(*file_sig),
 	       signature_size);

-	*ret_signature = signature;
-	sig_head->length = signature_size;
-
 	switch (file_sig->id_type) {
 	case PKEY_ID_PKCS7:
 		sig_head->format = PKCS7_FORMAT;
@@ -522,8 +519,12 @@ extract_signature(const char *filename, void **ret_signature,
 		error_text("Unsupported signature type %02x",
 			   file_sig->id_type);
 		signature_size = 0;
+		free(signature);
 		goto out;
 	}
+
+	sig_head->length = signature_size;
+	*ret_signature = signature;
 	/* return size of signature and corresponding header */
 	signature_size += sizeof(*file_sig);
 out:
@@ -542,13 +543,6 @@ check_remaining_filesize(size_t filesize, size_t signature_size,
 	}
 }

-static int is_last_table(struct install_set *bis, int table_id)
-{
-	assert(bis->nr_tables > 0 && bis->nr_tables <= NR_PROGRAM_TABLES);
-
-	return table_id == bis->nr_tables - 1;
-}
-
 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,
@@ -556,7 +550,6 @@ static int add_ipl_program(struct install_set *bis, char *filename,
 		struct job_target_data *target, int is_secure,
 		int menu_idx, int program_table_id)
 {
-	int last_table = is_last_table(bis, program_table_id);
 	struct signature_header sig_head;
 	size_t ramdisk_size, image_size;
 	size_t stage3_params_size;
@@ -588,7 +581,7 @@ static int add_ipl_program(struct install_set *bis, char *filename,
 	stats.st_size = 0;
 	if (ipl->common.ramdisk != NULL) {
 		/* Add ramdisk */
-		if (verbose && last_table)
+		if (verbose && bis->print_details)
 			printf("  initial ramdisk...: %s\n", ipl->common.ramdisk);
 		/* Get ramdisk file size */
 		if (stat(ipl->common.ramdisk, &stats)) {
@@ -646,7 +639,7 @@ static int add_ipl_program(struct install_set *bis, char *filename,
 	if (signature_size &&
 	    (is_secure == SECURE_BOOT_ENABLED ||
 	     (is_secure == SECURE_BOOT_AUTO && secure_boot_supported))) {
-		if (verbose && last_table)
+		if (verbose && bis->print_details)
 			printf("  signature for.....: %s\n", ZIPL_STAGE3_PATH);

 		rc = add_component_buffer(bis, signature, sig_head.length,
@@ -716,14 +709,14 @@ static int add_ipl_program(struct install_set *bis, char *filename,
 	offset += sizeof(struct component_entry);

 	/* Add kernel image */
-	if (verbose && last_table)
+	if (verbose && bis->print_details)
 		printf("  kernel image......: %s\n", ipl->common.image);

 	signature_size = extract_signature(ipl->common.image, &signature, &sig_head);
 	if (signature_size &&
 	    (is_secure == SECURE_BOOT_ENABLED ||
 	     (is_secure == SECURE_BOOT_AUTO && secure_boot_supported))) {
-		if (verbose && last_table)
+		if (verbose && bis->print_details)
 			printf("  signature for.....: %s\n", ipl->common.image);

 		rc = add_component_buffer(bis, signature, sig_head.length,
@@ -766,7 +759,7 @@ static int add_ipl_program(struct install_set *bis, char *filename,

 	/* Add kernel parmline */
 	if (ipl->common.parmline != NULL) {
-		if (verbose && last_table)
+		if (verbose && bis->print_details)
 			printf("  kernel parmline...: '%s'\n", ipl->common.parmline);
 		rc = add_component_buffer(bis, ipl->common.parmline,
 					  strlen(ipl->common.parmline) + 1,
@@ -790,7 +783,7 @@ static int add_ipl_program(struct install_set *bis, char *filename,
 		    (is_secure == SECURE_BOOT_ENABLED ||
 		     (is_secure == SECURE_BOOT_AUTO &&
 		      secure_boot_supported))) {
-			if (verbose && last_table) {
+			if (verbose && bis->print_details) {
 				printf("  signature for.....: %s\n",
 				       ipl->common.ramdisk);
 			}
@@ -883,7 +876,7 @@ static int add_ipl_program(struct install_set *bis, char *filename,
 		}
 		offset += sizeof(struct component_entry);
 	}
-	if (verbose && last_table)
+	if (verbose && bis->print_details)
 		print_components(bis, menu_idx);
 	/* Terminate component table */
 	create_component_entry(VOID_ADD(table, offset), NULL,
@@ -906,7 +899,6 @@ static int add_segment_program(struct install_set *bis,
 			       struct job_target_data *target,
 			       int program_table_id)
 {
-	int last_table = is_last_table(bis, program_table_id);
 	void *table;
 	int offset;
 	int rc;
@@ -920,7 +912,7 @@ static int add_segment_program(struct install_set *bis,
 	create_component_header(VOID_ADD(table, offset), type);
 	offset += sizeof(struct component_header);
 	/* Add segment file */
-	if (verbose && last_table)
+	if (verbose && bis->print_details)
 		printf("  segment file......: %s\n", segment->segment);

 	rc = add_component_file(bis, segment->segment, segment->segment_addr, 0,
@@ -935,7 +927,7 @@ static int add_segment_program(struct install_set *bis,
 	}
 	offset += sizeof(struct component_entry);
 	/* Print component addresses */
-	if (verbose && last_table)
+	if (verbose && bis->print_details)
 		print_components(bis, 0 /* menu_idx */);
 	/* Terminate component table */
 	create_component_entry(VOID_ADD(table, offset), NULL,
@@ -955,7 +947,8 @@ static int add_segment_program(struct install_set *bis,

 static int
 check_dump_device_late(char *partition, struct disk_info *target_info,
-		       struct job_target_data *target)
+		       struct job_target_data *target,
+		       struct job_data *job)
 {
 	struct disk_info* info;
 	int rc;
@@ -967,8 +960,10 @@ check_dump_device_late(char *partition, struct disk_info *target_info,
 			   partition);
 		return rc;
 	}
-	if ((info->type != disk_type_scsi) || (info->partnum == 0)) {
-		error_reason("Device '%s' is not a SCSI partition",
+	if ((job->is_ldipl_dump && info->type != disk_type_eckd_cdl) ||
+	    (!job->is_ldipl_dump && info->type != disk_type_scsi) ||
+	    info->partnum == 0) {
+		error_reason("Device '%s' is not a SCSI or DASD partition",
 			     partition);
 		disk_free_info(info);
 		return -1;
@@ -983,12 +978,13 @@ check_dump_device_late(char *partition, struct disk_info *target_info,
 	return 0;
 }

-static int add_dump_program(struct install_set *bis, struct job_dump_data *dump,
+static int add_dump_program(struct install_set *bis, struct job_data *job,
 			    disk_blockptr_t *program, int verbose,
 			    component_header_type type,
-			    struct job_target_data *target,
 			    int program_table_id)
 {
+	struct job_dump_data *dump = &job->data.dump;
+	struct job_target_data *target = &job->target;
 	struct job_ipl_data ipl;
 	int rc;

@@ -997,7 +993,7 @@ static int add_dump_program(struct install_set *bis, struct job_dump_data *dump,
 	ipl.common = dump->common;

 	/* Get file system dump parmline */
-	rc = check_dump_device_late(dump->device, bis->info, target);
+	rc = check_dump_device_late(dump->device, bis->info, target, job);
 	if (rc)
 		return rc;
 	ipl.common.parmline = dump->common.parmline;
@@ -1011,11 +1007,11 @@ static int add_dump_program(struct install_set *bis, struct job_dump_data *dump,
 /**
 * Build a program table from job data and set pointer to program table
 * block upon success
+ * PROGRAM_TABLE_ID: offset of the program table in the array (@bis->tables)
 */
 static int build_program_table(struct job_data *job,
 			       struct install_set *bis, int program_table_id)
 {
-	int last_table = is_last_table(bis, program_table_id);
 	int entries, component_header;
 	disk_blockptr_t *table;
 	int is_secure;
@@ -1033,7 +1029,7 @@ static int build_program_table(struct job_data *job,
 	/* Add programs */
 	switch (job->id) {
 	case job_ipl:
-		if (last_table) {
+		if (bis->print_details) {
 			if (job->command_line)
 				printf("Adding IPL section\n");
 			else
@@ -1052,7 +1048,7 @@ static int build_program_table(struct job_data *job,
 				     program_table_id);
 		break;
 	case job_segment:
-		if (last_table) {
+		if (bis->print_details) {
 			if (job->command_line)
 				printf("Adding segment load section\n");
 			else
@@ -1066,33 +1062,33 @@ static int build_program_table(struct job_data *job,
 		break;
 	case job_dump_partition:
 		/* Only useful for a partition dump that uses a dump kernel*/
-		if (last_table) {
+		if (bis->print_details) {
 			if (job->command_line)
 				printf("Adding dump section\n");
 			else
 				printf("Adding dump section '%s' (default)\n",
 				       job->name);
 		}
-		rc = add_dump_program(bis, &job->data.dump, &table[0],
+		rc = add_dump_program(bis, job, &table[0],
 				      verbose || job->command_line,
-				      COMPONENT_HEADER_DUMP, &job->target,
+				      COMPONENT_HEADER_DUMP,
 				      program_table_id);
 		break;
 	case job_menu:
-		if (last_table)
+		if (bis->print_details)
 			printf("Building menu '%s'\n", job->name);
 		rc = 0;
 		for (i=0; i < job->data.menu.num; i++) {
 			switch (job->data.menu.entry[i].id) {
 			case job_ipl:
-				if (last_table &&
+				if (bis->print_details &&
 				    job->data.menu.entry[i].data.ipl.common.ignore) {
 					printf("Skipping #%d: IPL section '%s' (missing files)\n",
 					       job->data.menu.entry[i].pos,
 					       job->data.menu.entry[i].name);
 					break;
 				}
-				if (last_table)
+				if (bis->print_details)
 					printf("Adding #%d: IPL section '%s'%s",
 					       job->data.menu.entry[i].pos,
 					       job->data.menu.entry[i].name,
@@ -1102,12 +1098,12 @@ static int build_program_table(struct job_data *job,
 				if (job->data.menu.entry[i].data.ipl.is_kdump) {
 					component_header =
 						COMPONENT_HEADER_DUMP;
-					if (last_table)
+					if (bis->print_details)
 						printf(" (kdump)\n");
 				} else {
 					component_header =
 						COMPONENT_HEADER_IPL;
-					if (last_table)
+					if (bis->print_details)
 						printf("\n");
 				}
 				if (job->is_secure != SECURE_BOOT_UNDEFINED)
@@ -1150,7 +1146,7 @@ static int build_program_table(struct job_data *job,
 		rc = -1;
 		break;
 	}
-	if (job->envblk.buf && verbose && last_table)
+	if (job->envblk.buf && verbose && bis->print_details)
 		envblk_print(job->envblk.buf, job->envblk.size);

 	if (rc == 0) {
@@ -1199,7 +1195,7 @@ static int install_stages_dasd_fba(int fd, char *filename,
 	void *stage2_data;

 	switch (program_table_id) {
-	case PROGRAM_TABLE_0:
+	case LEGACY_BLKPTR_FORMAT_ID:
 		/*
 		 * This program table is used for CCW-type IPL (see comments
 		 * for install_bootloader()).
@@ -1220,7 +1216,7 @@ static int install_stages_dasd_fba(int fd, char *filename,
 			return -1;
 		free(stage2_list);
 		break;
-	case PROGRAM_TABLE_1:
+	case BLKPTR_FORMAT_ID:
 		/*
 		 * This program table is not used when booting from DASD FBA
 		 * (see comments for install_bootloader()
@@ -1248,7 +1244,7 @@ static int install_stages_eckd_dasd(int fd, char *filename,
 	void *stage2b_data;

 	switch (program_table_id) {
-	case PROGRAM_TABLE_0:
+	case LEGACY_BLKPTR_FORMAT_ID:
 		/*
 		 * This program table is used for CCW-type IPL.
 		 * Add stage2 loader
@@ -1269,7 +1265,7 @@ static int install_stages_eckd_dasd(int fd, char *filename,
 			return -1;
 		free(stage2b_list);
 		break;
-	case PROGRAM_TABLE_1:
+	case BLKPTR_FORMAT_ID:
 		/*
 		 * This program table is used for List-Directed IPL,
 		 * which doesn't invoke stage2 loader.
@@ -1397,11 +1393,17 @@ static int disk_is_appropriate(const struct job_data *job,
 		error_reason("Secure boot forced for improper disk type");
 		return 0;
 	}
+	if (job->id == job_dump_partition &&
+	    job->is_ldipl_dump &&
+	    info->type != disk_type_eckd_cdl) {
+		error_reason("List-directed dump not support on DASD with LDL format");
+		return 0;
+	}
 	return 1;
 }

 static int
-check_dump_device(const struct job_data *job, const struct disk_info *info,
+check_dump_device(struct job_data *job, const struct disk_info *info,
 		  const char *device)
 {
 	int rc, part_ext;
@@ -1415,6 +1417,9 @@ check_dump_device(const struct job_data *job, const struct disk_info *info,
 	if (!disk_is_appropriate(job, info))
 		return -1;

+	if (is_ngdump_enabled(job))
+		return 0;
+
 	rc = util_part_search(device, info->geo.start,
 			      info->phy_blocks, info->phy_block_size, &part_ext);
 	if (rc <= 0 || part_ext) {
@@ -1430,30 +1435,15 @@ check_dump_device(const struct job_data *job, const struct disk_info *info,
 	return 0;
 }

-/**
- * Set actual number of "similar" program tables to be installed
- */
-static void set_nr_tables(struct job_data *job, struct install_set *bis)
-{
-	assert(bis->nr_tables == 0);
-
-	if (bis->info->type == disk_type_eckd_cdl &&
-	    (job->id == job_ipl || job->id == job_menu))
-		bis->nr_tables = NR_PROGRAM_TABLES;
-	else
-		bis->nr_tables = 1;
-}
-
 /**
 * Prepare resources to build a program table
 */
 static int prepare_build_program_table_device(struct job_data *job,
-					      struct install_set *bis,
-					      int program_table_id)
+					      struct install_set *bis)
 {
 	ulong unused_size;

-	if (program_table_id)
+	if (bis->skip_prepare)
 		/* skip the preparation work */
 		return 0;
 	/* Get full path of bootmap file */
@@ -1522,19 +1512,26 @@ static int prepare_build_program_table_device(struct job_data *job,
 			   bis->filename);
 		return -1;
 	}
-	set_nr_tables(job, bis);
 	return 0;
 }

-static int bootmap_create_device(struct job_data *job, struct install_set *bis,
-				 int program_table_id)
+/**
+ * Called when making a dump on a raw SCSI partition
+ */
+static int prepare_bootloader_device(struct job_data *job,
+				     struct install_set *bis)
 {
-	if (prepare_build_program_table_device(job, bis, program_table_id))
+	if (prepare_build_program_table_device(job, bis))
 		return -1;
-	if (build_program_table(job, bis, program_table_id))
+	/*
+	 * build a single program table at offset 1,
+	 * see comment before install_bootloader() for details
+	 */
+	bis->print_details = 1;
+	if (build_program_table(job, bis, BLKPTR_FORMAT_ID))
 		return -1;
 	/* Install stage 2 loader to bootmap if necessary */
-	if (bootmap_install_stages(job, bis, program_table_id)) {
+	if (bootmap_install_stages(job, bis, BLKPTR_FORMAT_ID)) {
 		error_text("Could not install loader stages to bootmap");
 		return -1;
 	}
@@ -1546,10 +1543,9 @@ static int bootmap_create_device(struct job_data *job, struct install_set *bis,
 */
 static int prepare_build_program_table_file(struct job_data *job,
 					    char *bootmap_dir,
-					    struct install_set *bis,
-					    int program_table_id)
+					    struct install_set *bis)
 {
-	if (program_table_id)
+	if (bis->skip_prepare)
 		/* skip the preparation work */
 		return 0;
 	/* Create temporary bootmap file */
@@ -1602,7 +1598,6 @@ static int prepare_build_program_table_file(struct job_data *job,
 		error_text("Could not write to file '%s'", bis->filename);
 		return -1;
 	}
-	set_nr_tables(job, bis);
 	return 0;
 }

@@ -1627,11 +1622,13 @@ static int finalize_create_file(char *bootmap_dir, struct install_set *bis)
 	return 0;
 }

-static int bootmap_create_file(struct job_data *job, char *bootmap_dir,
-			       struct install_set *bis, int program_table_id)
+/*
+ * PROGRAM_TABLE_ID: offset of the program table in the array (@bis->tables)
+ */
+static int bootmap_create_file(struct job_data *job, struct install_set *bis,
+			       char *bootmap_dir, int program_table_id)
 {
-	if (prepare_build_program_table_file(job, bootmap_dir, bis,
-					     program_table_id))
+	if (prepare_build_program_table_file(job, bootmap_dir, bis))
 		return -1;
 	if (build_program_table(job, bis, program_table_id))
 		return -1;
@@ -1641,8 +1638,6 @@ static int bootmap_create_file(struct job_data *job, char *bootmap_dir,
 			   bis->filename);
 		return -1;
 	}
-	if (!dry_run && is_last_table(bis, program_table_id))
-		return finalize_create_file(bootmap_dir, bis);
 	return 0;
 }

@@ -1680,14 +1675,12 @@ ngdump_create_meta(const char *path)
 	return 0;
 }

-static int bootmap_create_device_ngdump(struct job_data *job,
-					struct install_set *bis,
-					int program_table_id)
+static int prepare_bootloader_ngdump(struct job_data *job,
+				     struct install_set *bis)
 {
 	struct disk_info *info;
-	int rc;
+	char *bootmap_dir;

-	assert(program_table_id == 0);
 	/* Retrieve target device information */
 	if (disk_get_info(job->data.dump.device, &job->target, &info))
 		return -1;
@@ -1712,22 +1705,6 @@ static int bootmap_create_device_ngdump(struct job_data *job,
 		return -1;
 	}
 	bis->dump_tmp_dir_created = 1;
-	if (!dry_run) {
-		char *cmd = NULL;
-		util_asprintf(&cmd, "mkfs.%s -qF %s >/dev/null",
-			      NGDUMP_FSTYPE, job->data.dump.device);
-		if (verbose)
-			printf("Formatting partition '%s'\n",
-				job->data.dump.device);
-		rc = system(cmd);
-		free(cmd);
-		if (rc) {
-			error_reason(strerror(errno));
-			error_text("Could not format partition '%s':",
-				   job->data.dump.device);
-			return -1;
-		}
-	}
 	/*
 	 * Mount partition where bootmap file and also a dump file will
 	 * be stored.
@@ -1740,29 +1717,47 @@ static int bootmap_create_device_ngdump(struct job_data *job,
 		return -1;
 	}
 	bis->dump_mounted = 1;
-	if (bootmap_create_file(job, bis->dump_mount_point,
-				bis, program_table_id))
+	bootmap_dir = bis->dump_mount_point;
+	/*
+	 * Build a single program table for List-Directed IPL
+	 * See comments before install_bootloader() for details
+	 */
+	bis->print_details = 1;
+	if (bootmap_create_file(job, bis, bootmap_dir, BLKPTR_FORMAT_ID))
 		return -1;
-	if (ngdump_create_meta(bis->dump_mount_point))
+	if (!dry_run && finalize_create_file(bootmap_dir, bis))
 		return -1;
-	return 0;
+	return ngdump_create_meta(bootmap_dir);
 }

-
-static int
-bootmap_create(struct job_data *job, struct install_set *bis,
-	       int program_table_id)
+/**
+ * Build one or two program tables for CCW-type and(or) for List-Direceted IPL
+ * at respective offsets in the array BIS->tables. See the comment before
+ * install_bootloader() for details
+ */
+static int prepare_bootloader_ipl(struct job_data *job, struct install_set *bis)
 {
-	if (job->id == job_dump_partition) {
-		if (is_ngdump_enabled(job->data.dump.device, &job->target))
-			return bootmap_create_device_ngdump(job, bis,
-							    program_table_id);
-		else
-			return bootmap_create_device(job, bis,
-						     program_table_id);
-	} else
-		return bootmap_create_file(job, job->target.bootmap_dir,
-					   bis, program_table_id);
+	char *bootmap_dir = job->target.bootmap_dir;
+
+	/*
+	 * Build a program table for List-Directed IPL from
+	 * SCSI or ECKD DASD
+	 */
+	bis->print_details = 1;
+	if (bootmap_create_file(job, bis, bootmap_dir, BLKPTR_FORMAT_ID))
+		return -1;
+	if (bis->info->type == disk_type_scsi)
+		/* only one table to be installed per device */
+		return dry_run ? 0 : finalize_create_file(bootmap_dir, bis);
+	/*
+	 * Build one more program table for CCW-type IPL from
+	 * ECKD DASD
+	 */
+	bis->skip_prepare = 1;
+	bis->print_details = 0;
+	if (bootmap_create_file(job, bis, bootmap_dir, LEGACY_BLKPTR_FORMAT_ID))
+		return -1;
+	return dry_run ? 0 : finalize_create_file(bootmap_dir, bis);
 }

 /**
@@ -1796,20 +1791,19 @@ static int init_bis(struct job_data *job, struct install_set *bis)
 */
 int prepare_bootloader(struct job_data *job, struct install_set *bis)
 {
-	int i;
-	int rc;
-
 	secure_boot_supported = check_secure_boot_support();

-	rc = init_bis(job, bis);
-	if (rc)
-		return rc;
-	for (i = 0;; i++) {
-		rc = bootmap_create(job, bis, i);
-		if (rc || is_last_table(bis, i))
-			break;
+	if (init_bis(job, bis))
+		return -1;
+	if (job->id == job_dump_partition) {
+		if (is_ngdump_enabled(job))
+			return prepare_bootloader_ngdump(job, bis);
+		else
+			return prepare_bootloader_device(job, bis);
+	} else {
+		return prepare_bootloader_ipl(job, bis);
 	}
-	return rc;
+	return -1;
 }

 /**
--- a/zipl/src/disk.c
+++ b/zipl/src/disk.c
@@ -509,6 +509,19 @@ disk_is_scsi(const char* device, struct job_target_data* target)
 	return rc;
 }

+int disk_is_eckd_ldl(const char *device, struct job_target_data *target)
+{
+	struct disk_info *info;
+	int rc = 0;
+
+	if (disk_get_info(device, target, &info) == -1)
+		return 0;
+	if (info->type == disk_type_eckd_ldl)
+		rc = 1;
+	disk_free_info(info);
+	return rc;
+}
+
 int
 disk_is_nvme(const char* device, struct job_target_data* target)
 {
@@ -828,7 +841,7 @@ disk_get_type_name(disk_type_t type)
 }

 /* Return IPL types supported for a given disk TYPE */
-char *disk_get_ipl_type(disk_type_t type)
+char *disk_get_ipl_type(disk_type_t type, int is_dump)
 {
 	switch (type) {
 	case disk_type_scsi:
@@ -837,7 +850,7 @@ char *disk_get_ipl_type(disk_type_t type)
 	case disk_type_eckd_ldl:
 		return "CCW-";
 	case disk_type_eckd_cdl:
-		return "CCW- and LD-";
+		return is_dump ? "LD-" : "CCW- and LD-";
 	default:
 		return "";
 	}
--- a/zipl/src/install.c
+++ b/zipl/src/install.c
@@ -112,7 +112,7 @@ update_scsi_mbr(void* bootblock, disk_blockptr_t* table,
 	mbr->version_id = DISK_LAYOUT_ID;
 	bootmap_store_blockptr(&mbr->program_table_pointer, table, info,
 			       0 /* this argument is ignored for scsi */);
-	if (scsi_dump_sb_blockptr->linear.block != 0) {
+	if (scsi_dump_sb_blockptr && scsi_dump_sb_blockptr->linear.block != 0) {
 		/* Write dump boot_info */
 		param.block = scsi_dump_sb_blockptr->linear.block *
 			      scsi_dump_sb_blockptr->linear.size;
@@ -318,35 +318,113 @@ static int install_eckd_cdl_ld(int fd, disk_blockptr_t *br,
 	return 0;
 }

+/**
+ * Install program tables for CCW-type and(or) List-Directed IPL
+ * See the comment before install_bootloader() for details.
+ *
+ * TABLES: array of the program tables to be installed
+ */
+int install_bootloader_ipl(struct program_table *tables,
+			   struct disk_info *info,
+			   int fd)
+{
+	struct program_table *pt = &tables[LEGACY_BLKPTR_FORMAT_ID];
+
+	int rc = -1;
+
+	switch (info->type) {
+	case disk_type_scsi:
+		/* List-Directed IPL */
+		pt = &tables[BLKPTR_FORMAT_ID];
+		rc = install_scsi(fd, &pt->table, info, NULL);
+		break;
+	case disk_type_fba:
+		rc = install_fba_ccw(fd,
+				     &pt->table,
+				     pt->stage1b_list,
+				     pt->stage1b_count, info);
+		break;
+	case disk_type_eckd_ldl:
+		rc = install_eckd_ldl_ccw(fd,
+					  &pt->table,
+					  pt->stage1b_list,
+					  pt->stage1b_count, info);
+		break;
+	case disk_type_eckd_cdl:
+		rc = install_eckd_cdl_ccw(fd,
+					  &pt->table,
+					  pt->stage1b_list,
+					  pt->stage1b_count, info);
+		if (rc)
+			break;
+		/* install one more table for List-Directed IPL */
+		pt = &tables[BLKPTR_FORMAT_ID];
+		rc = install_eckd_cdl_ld(fd, pt->stage1b_list, info);
+		break;
+	case disk_type_diag:
+		error_reason("Inappropriarte device type (%d) for IPL",
+			     info->type);
+		break;
+	}
+	return rc;
+}
+
+/**
+ * Install a program table for List-Directed dump
+ * See the comment before install_bootloader() for details
+ */
+static int install_bootloader_dump(struct program_table *tables,
+				   struct disk_info *info,
+				   disk_blockptr_t *scsi_dump_sb_blockptr,
+				   int ngdump_enabled,
+				   int fd)
+{
+	struct program_table *pt = &tables[BLKPTR_FORMAT_ID];
+	int rc = -1;
+
+	switch (info->type) {
+	case disk_type_scsi:
+		rc = install_scsi(fd, &pt->table, info, scsi_dump_sb_blockptr);
+		if (rc == 0 && !ngdump_enabled)
+			rc = overwrite_partition_start(fd, info, 0);
+		break;
+	case disk_type_eckd_cdl:
+		rc = install_eckd_cdl_ld(fd, pt->stage1b_list, info);
+		break;
+	default:
+		error_reason("Inappropriarte device type (%d) for List-Directed dump",
+			     info->type);
+		break;
+	}
+	return rc;
+}
+
 /**
 * Install a "compatible" boot record referring one, or two "similar"
 * program tables.
 *
- * The picture below shows which program table is used for IPL
- * of specified type from disk of specified type.
- * E.g. program table "0" is used for CCW-type IPL from ECKD DASD,
- * LD-IPL from DASD FBA is unsupported (respectively, only one program
- * table "0" is used), etc.
- *
- *                            CCW-IPL   LD-IPL
- *
- * SCSI                          X        0
- * DASD FBA                      0        X
- * ECKD DASD LDL                 0        X
- * ECKD DASD CDL                 0        1
+ * For compatibility reasons zIPL installs multiple "similar"
+ * program tables which differ only in block pointers format.
+ * Each such table is identified by an offset in the array BIS->tables
+ * of in-memory program table representations built by prepare_bootloader().
+ * The common rule is that tables built for CCW-type IPL are placed
+ * at offset 0, and tables built for List-Directed IPL are placed at
+ * offset 1. The same works for dumps.
 */
 int install_bootloader(struct job_data *job, struct install_set *bis)
 {
 	disk_blockptr_t *scsi_dump_sb_blockptr = &bis->scsi_dump_sb_blockptr;
-	struct program_table *pt0 = &bis->tables[PROGRAM_TABLE_0];
-	struct program_table *pt1 = &bis->tables[PROGRAM_TABLE_1];
 	struct disk_info *info = bis->info;
 	char *device = bis->device;
 	int fd, rc;

+	if (!info)
+		return 0;
 	/* Inform user about what we're up to */
-	printf("Preparing boot device for %sIPL: ",
-	       disk_get_ipl_type(info->type));
+	printf("Preparing boot device for %s%s: ",
+	       disk_get_ipl_type(info->type,
+				 job->id == job_dump_partition),
+	       job->id == job_dump_partition ? "dump" : "IPL");
 	if (info->name) {
 		printf("%s", info->name);
 		if (info->devno >= 0)
@@ -379,39 +457,13 @@ int install_bootloader(struct job_data *job, struct install_set *bis)
 	 * for CCW-type IPL and (or) for List-Directed IPL (see the
 	 * picture in comments above)
 	 */
-	rc = -1;
-	switch (info->type) {
-	case disk_type_scsi:
-		rc = install_scsi(fd, &pt0->table, info,
-				  scsi_dump_sb_blockptr);
-		if (rc == 0 && job->id == job_dump_partition &&
-		    !is_ngdump_enabled(device, &job->target))
-			rc = overwrite_partition_start(fd, info, 0);
-		break;
-	case disk_type_fba:
-		rc = install_fba_ccw(fd,
-				     &pt0->table,
-				     pt0->stage1b_list,
-				     pt0->stage1b_count, info);
-		break;
-	case disk_type_eckd_ldl:
-		rc = install_eckd_ldl_ccw(fd,
-					  &pt0->table,
-					  pt0->stage1b_list,
-					  pt0->stage1b_count, info);
-		break;
-	case disk_type_eckd_cdl:
-		rc = install_eckd_cdl_ccw(fd,
-					  &pt0->table,
-					  pt0->stage1b_list,
-					  pt0->stage1b_count, info);
-		if (rc)
-			break;
-		rc = install_eckd_cdl_ld(fd, pt1->stage1b_list, info);
-		break;
-	case disk_type_diag:
-		/* Should not happen */
-		break;
+	if (job->id == job_dump_partition) {
+		rc = install_bootloader_dump(bis->tables, info,
+					     scsi_dump_sb_blockptr,
+					     is_ngdump_enabled(job),
+					     fd);
+	} else {
+		rc = install_bootloader_ipl(bis->tables, info, fd);
 	}

 	if (fsync(fd))
--- a/zipl/src/job.c
+++ b/zipl/src/job.c
@@ -63,6 +63,7 @@ static struct option options[] = {
 	{ "dry-run",		no_argument,		NULL, '0'},
 	{ "force",		no_argument,		NULL, 'f'},
 	{ "kdump",		required_argument,	NULL, 'k'},
+	{ "ldipl-dump",         no_argument,            NULL, 0xb0},
 	{ "secure",		required_argument,	NULL, 'S'},
 	{ NULL,			0,			NULL, 0 }
 };
@@ -93,6 +94,7 @@ struct command_line {
 	int dry_run;
 	int force;
 	int is_secure;
+	int is_ldipl_dump;
 	enum scan_section_type type;
 };

@@ -284,6 +286,9 @@ get_command_line(int argc, char* argv[], struct command_line* line)
 		case 'f':
 			cmdline.force = 1;
 			break;
+		case 0xb0:
+			cmdline.is_ldipl_dump = 1;
+			break;
 		case 1:
 			/* Non-option is interpreted as section name */
 			if (cmdline.section != NULL) {
@@ -561,11 +566,13 @@ get_common_components(struct job_common_ipl_data *common,
 			    MAXIMUM_PHYSICAL_BLOCKSIZE);
 	if (rc)
 		goto error;
-	rc = set_cl_element(&cl[num++], "parmline", NULL, &common->parm_addr,
-			    MAXIMUM_PARMLINE_SIZE, 0,
-			    MAXIMUM_PHYSICAL_BLOCKSIZE);
-	if (rc)
-		goto error;
+	if (common->parmline) {
+		rc = set_cl_element(&cl[num++], "parmline", NULL, &common->parm_addr,
+				    MAXIMUM_PARMLINE_SIZE, 0,
+				    MAXIMUM_PHYSICAL_BLOCKSIZE);
+		if (rc)
+			goto error;
+	}
 	if (common->ramdisk) {
 		rc = set_cl_element(&cl[num++], "initial ramdisk",
 				    common->ramdisk, &common->ramdisk_addr,
@@ -785,6 +792,7 @@ check_common_ipl_data(struct job_common_ipl_data *common, const char *section,
 		}
 		if (size < MAX_COMMAND_LINE_SIZE + sizeof(uint64_t)) {
 			error_text_section("Image file", section, common->image);
+			free(buffer);
 			return -1;
 		}

@@ -797,8 +805,11 @@ check_common_ipl_data(struct job_common_ipl_data *common, const char *section,
 			error_text("The length of the parameters line "
 				   "(%d bytes) exceeds the allowed maximum "
 				   "(%d bytes) in section '%s'", len, max_parm_size, section);
+			free(buffer);
 			return -1;
 		}
+		free(buffer);
+		buffer = NULL;
 	}
 skip_image:
 	if (common->ramdisk != NULL) {
@@ -908,7 +919,7 @@ check_job_images_ngdump(struct job_dump_data* dump, char *name)
 	FILE *fp;
 	int rc;

-	misc_asprintf(&ppn_cmd, "%s %s", helper, dump->device);
+	misc_asprintf(&ppn_cmd, "%s %s %d", helper, dump->device, dry_run);
 	printf("Run %s\n", ppn_cmd);

 	fp = popen(ppn_cmd, "r");
@@ -1972,6 +1983,7 @@ job_get(int argc, char* argv[], struct job_data** data)
 	job->data.mvdump.force = cmdline.force;
 	job->dry_run = cmdline.dry_run;
 	job->is_secure =  SECURE_BOOT_UNDEFINED;
+	job->is_ldipl_dump = cmdline.is_ldipl_dump;
 	if (job->verbose)
 		printf("Looking for components in '%s'\n", util_libdir());

@@ -2014,7 +2026,9 @@ job_get(int argc, char* argv[], struct job_data** data)
 }

 bool
-is_ngdump_enabled(const char* device, struct job_target_data* target)
+is_ngdump_enabled(struct job_data *job)
 {
-	return disk_is_nvme(device, target);
+	if (job->is_ldipl_dump)
+		return true;
+	return disk_is_nvme(job->data.dump.device, &job->target);
 }
--- a/zipl/src/scan.c
+++ b/zipl/src/scan.c
@@ -1873,8 +1873,10 @@ void scan_update_bls_path(struct scan_token *scan)
 			if (misc_check_readable_file(file)) {
 				misc_asprintf(&img_value, "%s%s",
 					      target_value, file);
-				if (misc_check_readable_file(img_value))
+				if (misc_check_readable_file(img_value)) {
+					free(img_value);
 					continue;
+				}

 				/*
 				 * when file has stripped the load address part,
--- a/zipl/src/zipl.c
+++ b/zipl/src/zipl.c
@@ -72,6 +72,7 @@ static const char* usage_text[] = {
 "                                stand-alone dump tool",
 "-d, --dumpto DUMPDEV[,SIZE]     Install a system dump record on tape device",
 "                                or disk partition DUMPDEV",
+"    --ldipl-dump                Install a List-directed dump",
 "-M, --mvdump DEVLIST[,SIZE]     Install a multi-volume dump record on each",
 "                                disk partition listed in file DEVLIST",
 "-f, --force                     Disable sanity check while producing a",
@@ -171,8 +172,9 @@ main(int argc, char* argv[])
 	/* Do it */
 	switch (job->id) {
 	case job_dump_partition:
-		if (disk_is_tape(job->data.dump.device) ||
-		    !disk_is_scsi(job->data.dump.device, &job->target)) {
+		if (!is_ngdump_enabled(job) &&
+		    (disk_is_tape(job->data.dump.device) ||
+		     !disk_is_scsi(job->data.dump.device, &job->target))) {
 			rc = install_dump(job->data.dump.device, &job->target,
 					  job->data.dump.mem);
 			break;
@@ -184,10 +186,16 @@ main(int argc, char* argv[])
 			rc = -1;
 			break;
 		}
-		if (is_ngdump_enabled(job->data.dump.device, &job->target))
+		if (is_ngdump_enabled(job)) {
+			if (disk_is_eckd_ldl(job->data.dump.device, &job->target)) {
+				error_reason("List-directed dump on ECKD with LDL not supported");
+				rc = -1;
+				break;
+			}
 			rc = check_job_images_ngdump(&job->data.dump, job->name);
-		else
+		} else {
 			rc = check_job_dump_images(&job->data.dump, job->name);
+		}
 		if (rc != 0)
 			break;
 		/* Fall through. */
--- a/zkey/Makefile
+++ b/zkey/Makefile
@@ -132,7 +132,7 @@ endif

 $(SUB_DIRS):
 	$(foreach goal,$(MAKECMDGOALS), \
-		$(MAKE) -C $@ TOPDIR=$(TOPDIR) ARCH=$(ARCH) $(goal) ;)
+		$(MAKE) -C $@ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) $(goal) ;)
 .PHONY: $(SUB_DIRS)

 .PHONY: all install clean zkey-skip zkey-cryptsetup-skip-cryptsetup2 \
--- a/zkey/ekmfweb/Makefile
+++ b/zkey/ekmfweb/Makefile
@@ -38,11 +38,11 @@ zkey-ekmfweb.so: zkey-ekmfweb.o plugin-utils.o properties.o pkey.o cca.o \
 	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@

 install-libekmfweb.dep:
-	$(MAKE) -C $(rootdir)/libekmfweb/ TOPDIR=$(TOPDIR) ARCH=$(ARCH) install
+	$(MAKE) -C $(rootdir)/libekmfweb/ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) install
 	touch install-libekmfweb.dep

 libekmfweb.dep:
-	$(MAKE) -C $(rootdir)/libekmfweb/ TOPDIR=$(TOPDIR) ARCH=$(ARCH) all
+	$(MAKE) -C $(rootdir)/libekmfweb/ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) all
 	touch libekmfweb.dep

 install: all install-libekmfweb.dep zkey-ekmfweb.so
@@ -54,4 +54,4 @@ install: all install-libekmfweb.dep zkey-ekmfweb.so
 clean:
 	rm -f *.o zkey-ekmfweb.so install-libekmfweb.dep libekmfweb.dep

-.PHONY: all install clean
+.PHONY: all install clean
--- a/zkey/kmip/Makefile
+++ b/zkey/kmip/Makefile
@@ -39,11 +39,11 @@ zkey-kmip.so: zkey-kmip.o plugin-utils.o properties.o pkey.o cca.o ep11.o \
 	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@

 install-libkmipclient.dep:
-	$(MAKE) -C $(rootdir)/libkmipclient/ TOPDIR=$(TOPDIR) ARCH=$(ARCH) install
+	$(MAKE) -C $(rootdir)/libkmipclient/ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) install
 	touch install-libkmipclient.dep

 libkmipclient.dep:
-	$(MAKE) -C $(rootdir)/libkmipclient/ TOPDIR=$(TOPDIR) ARCH=$(ARCH) all
+	$(MAKE) -C $(rootdir)/libkmipclient/ TOPDIR=$(TOPDIR) HOST_ARCH=$(HOST_ARCH) all
 	touch libkmipclient.dep

 install: all install-libkmipclient.dep zkey-kmip.so
@@ -58,4 +58,4 @@ install: all install-libkmipclient.dep zkey-kmip.so
 clean:
 	rm -f *.o zkey-kmip.so install-libkmipclient.dep libkmipclient.dep

-.PHONY: all install clean
+.PHONY: all install clean