update filelist for multi-arch builds

Also generalize the systemd-sysusers and systemd-tmpfiles support.

.gitignore

@@ -5,10 +5,5 @@ src_vipa-2.0.4.tar.gz
 /lib-zfcp-hbaapi-2.1.tar.gz
 /src_vipa-2.1.0.tar.gz
 /s390-tools-*.tar.bz2
-/s390-tools-2.0.0.tar.gz
-/s390-tools-2.1.0.tar.gz
-/s390-tools-2.2.0.tar.gz
-/s390-tools-2.3.0.tar.gz
-/s390-tools-2.4.0.tar.gz
-/s390-tools-2.5.0.tar.gz
-/s390-tools-2.6.0.tar.gz
+/s390-tools-*.tar.gz
+/s390-tools-*-rust-vendor.tar.xz

20-zipl-kernel.install

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
+    exit 0
+fi
+
 [[ -f /etc/sysconfig/kernel ]] && . /etc/sysconfig/kernel
 
 COMMAND="$1"
@@ -11,10 +15,8 @@ KERNEL_DIR="${KERNEL_IMAGE%/*}"
 
 MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
 
-# Remove it, since for zipl the images are always installed in /boot
-rm -rf "${BOOT_DIR_ABS%/*}"
-
 BLS_DIR="/boot/loader/entries"
+ZIPLCFG="/etc/zipl.conf"
 CMDLINE_LINUX_DEBUG=" systemd.log_level=debug systemd.log_target=kmsg"
 LINUX_DEBUG_VERSION_POSTFIX="_with_debugging"
 LINUX_DEBUG_TITLE_POSTFIX=" with debugging"
@@ -52,27 +54,31 @@ EOF
 case "$COMMAND" in
     add)
         if [[ "${KERNEL_DIR}" != "/boot" ]]; then
+            # rename to match the name used in the pseudo-BLS snippet above
+            cp --remove-destination --preserve=timestamps -T "${KERNEL_IMAGE}" "/boot/vmlinuz-${KERNEL_VERSION}"
+            command -v restorecon &>/dev/null && \
+                restorecon -R "/boot/vmlinuz-${KERNEL_VERSION}"
+
             for i in \
-                "$KERNEL_IMAGE" \
                     "$KERNEL_DIR"/System.map \
                     "$KERNEL_DIR"/config \
                     "$KERNEL_DIR"/zImage.stub
             do
                 [[ -e "$i" ]] || continue
-                cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
+                cp --preserve=timestamps -T "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
                 command -v restorecon &>/dev/null && \
                     restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
             done
             # hmac is .vmlinuz-<version>.hmac so needs a special treatment
             i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
             if [[ -e "$i" ]]; then
-                cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
+                cp --preserve=timestamps "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
                 command -v restorecon &>/dev/null && \
                     restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
             fi
         fi
 
-        if [[ ! -f /sbin/new-kernel-pkg ]]; then
+        if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
             declare -a BOOT_OPTIONS
             if [[ -f /etc/kernel/cmdline ]]; then
                 read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
@@ -81,43 +87,57 @@ case "$COMMAND" in
             if ! [[ ${BOOT_OPTIONS[*]} ]]; then
                 read -r -d '' -a line < /proc/cmdline
                 for i in "${line[@]}"; do
-                    [[ "${i#initrd=*}" != "$i" ]] && continue
+                    [[ "${i#initrd=*}" != "$i" || "${i#BOOT_IMAGE=*}" != "$i" ]] && continue
                     BOOT_OPTIONS+=("$i")
                 done
             fi
 
-            if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-                echo "Could not determine the kernel command line parameters." >&2
-                echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
-                exit 1
-            fi
-
             [[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
             BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
             if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
-                cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
+                cp --preserve=timestamps -T "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
                 sed -i -e "s,^linux.*,linux /boot/vmlinuz-${KERNEL_VERSION},g" "${BLS_TARGET}"
                 sed -i -e "s,^initrd.*,initrd /boot/initramfs-${KERNEL_VERSION}.img,g" "${BLS_TARGET}"
-                sed -i -e "s,^options.*,options ${BOOT_OPTIONS[*]},g" "${BLS_TARGET}"
+                sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_TARGET}"
             else
                 mkbls "${KERNEL_VERSION}" \
                     "$(date -u +%Y%m%d%H%M%S -d "$(stat -c '%y' "${KERNEL_DIR}")")" \
                     "${BOOT_OPTIONS[*]}" >"${BLS_TARGET}"
             fi
 
+            if [[ "$KERNEL_VERSION" == *\+* ]] && [ "x$DEFAULTDEBUG" != "xyes" ]; then
+                UPDATEDEFAULT="no"
+            fi
+
+            if [[ "x$UPDATEDEFAULT" = "xyes" ]]; then
+                TITLE="$(grep '^title[ \t]' "${BLS_TARGET}" | sed -e 's/^title[ \t]*//')"
+                NEWDEFAULT="${TITLE}"
+            fi
+
             if [ "x${MAKEDEBUG}" = "xyes" ]; then
-                ARCH="$(uname -m)"
-                BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/\.${ARCH}/-debug.${ARCH}/")"
-                cp -aT  "${BLS_TARGET}" "${BLS_DEBUG}"
+                BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
+                cp --preserve=timestamps -T  "${BLS_TARGET}" "${BLS_DEBUG}"
                 TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
 		VERSION="$(grep '^version[ \t]' "${BLS_DEBUG}" | sed -e 's/^version[ \t]*//')"
-                BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/\.${ARCH}/-debug.${ARCH}/")"
+                BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
                 sed -i -e "s/^title.*/title ${TITLE}${LINUX_DEBUG_TITLE_POSTFIX}/" "${BLS_DEBUG}"
 		sed -i -e "s/^version.*/version ${VERSION}${LINUX_DEBUG_VERSION_POSTFIX}/" "${BLS_DEBUG}"
                 sed -i -e "s/^id.*/${BLSID}/" "${BLS_DEBUG}"
-                sed -i -e "s,^options.*,options ${BOOT_OPTIONS[*]}${CMDLINE_LINUX_DEBUG}," "${BLS_DEBUG}"
+                sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}${CMDLINE_LINUX_DEBUG}#" "${BLS_DEBUG}"
+                if [ -n "$NEWDEFAULT" -a "x$DEFAULTDEBUG" = "xyes" ]; then
+                    TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
+                    NEWDEFAULT="${TITLE}"
+                fi
 	    fi
 
+            if [ -n "$NEWDEFAULT" ] && [ -f "${ZIPLCFG}" ]; then
+                if grep -q "^default=" "${ZIPLCFG}"; then
+                    sed -i -e "s,^default=.*,default=${NEWDEFAULT}," "${ZIPLCFG}"
+                else
+                    echo "default=${NEWDEFAULT}" >> "${ZIPLCFG}"
+                fi
+            fi
+
             exit 0
         fi
 
@@ -128,10 +148,21 @@ case "$COMMAND" in
         exit 77
         ;;
     remove)
-        if [[ ! -f /sbin/new-kernel-pkg ]]; then
+        if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
             ARCH="$(uname -m)"
             BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
-            BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/\.${ARCH}/-debug.${ARCH}/")"
+            BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
+
+            if [ -f "${BLS_TARGET}" ] && [ -f "${ZIPLCFG}" ]; then
+                TITLE="$(grep '^title[ \t]' "${BLS_TARGET}" | sed -e 's/^title[ \t]*//')"
+                sed -i -e "/^default=${TITLE}/d" "${ZIPLCFG}"
+            fi
+
+            if [[ -f "${BLS_DEBUG}" ]]; then
+                TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
+                sed -i -e "/^default=${TITLE}/d" "${ZIPLCFG}"
+            fi
+
             rm -f "${BLS_TARGET}" "${BLS_DEBUG}"
 
             for i in vmlinuz System.map config zImage.stub dtb; do

52-zipl-rescue.install

@@ -15,7 +15,7 @@ BLS_DIR="/boot/loader/entries"
 [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
 case "$COMMAND" in
     add)
-        if [[ ! -f /sbin/new-kernel-pkg ]]; then
+        if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
             declare -a BOOT_OPTIONS
             if [[ -f /etc/kernel/cmdline ]]; then
                 read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
@@ -29,17 +29,11 @@ case "$COMMAND" in
                 done
             fi
 
-            if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-                echo "Could not determine the kernel command line parameters." >&2
-                echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
-                exit 1
-            fi
-
             BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
             if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
                sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"
                sed -i -e "s,^initrd.*,initrd /boot/initramfs-0-rescue-${MACHINE_ID}.img,g" "${BLS_RESCUE}"
-               sed -i -e "s,^options.*,options ${BOOT_OPTIONS[*]},g" "${BLS_RESCUE}"
+               sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_RESCUE}"
             fi
         fi
         ;;

91-zipl.install

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if [[ ! -f /etc/zipl.conf ]]; then
+    exit 0
+fi
+
 COMMAND="$1"
 
 case "$COMMAND" in

ccw.udev

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

ccw_init

@@ -24,6 +24,25 @@ get_config_line_by_subchannel()
     return 1
 }
 
+# borrowed from network-scrips, initscripts along with the get_config_by_subchannel
+[ -z "$__sed_discard_ignored_files" ] && __sed_discard_ignored_files='/\(~\|\.bak\|\.old\|\.orig\|\.rpmnew\|\.rpmorig\|\.rpmsave\)$/d'
+
+get_config_by_subchannel ()
+{
+    LANG=C grep -E -i -l \
+        "^[[:space:]]*SUBCHANNELS=['\"]?([0-9]\.[0-9]\.[a-f0-9]+,){0,2}${1}(,[0-9]\.[0-9]\.[a-f0-9]+){0,2}['\"]?([[:space:]]+#|[[:space:]]*$)" \
+        /etc/sysconfig/network-scripts/ifcfg-* \
+        | LC_ALL=C sed -e "$__sed_discard_ignored_files"
+}
+
+get_config_by_subchannel_nm ()
+{
+    LANG=C grep -E -i -l \
+        "^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){0,2}${1};([0-9]\.[0-9]\.[a-f0-9]+;){0,2}$" \
+        /etc/NetworkManager/system-connections/*.nmconnection \
+        | LC_ALL=C sed -e "$__sed_discard_ignored_files"
+}
+
 CHANNEL=${DEVPATH##*/}
 
 if [ $MODE = "dracut" ]; then
@@ -49,14 +68,19 @@ if [ $MODE = "dracut" ]; then
 elif [ $MODE = "normal" ]; then
     NOLOCALE="yes"
 
-    . /etc/sysconfig/network-scripts/network-functions
-
     CONFIG_FILE=$(get_config_by_subchannel $CHANNEL)
 
     if [ -n "$CONFIG_FILE" ]; then
 	. $CONFIG_FILE
     else
-	exit 1
+	CONFIG_FILE=$(get_config_by_subchannel_nm $CHANNEL)
+	if [ -n "$CONFIG_FILE" ]; then
+	    NETTYPE=$(sed -nr "/^\[ethernet\]/ { :l /^s390-nettype[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
+	    SUBCHANNELS=$(sed -nr "/^\[ethernet\]/ { :l /^s390-subchannels[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE | sed -e "s/;/,/g" -e "s/,$//")
+	    LAYER2=$(sed -nr "/^\[ethernet-s390-options\]/ { :l /^layer2[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
+	else
+	    exit 1
+	fi
     fi
 else
     echo "Unknown mode=$MODE"

cmsfs-1.1.8-kernel26.patch

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

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

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

cmsfs-1.1.8-warnings.patch

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

device_cio_free

@@ -306,6 +306,14 @@ if [ $MODE_ZNET ]; then
 	eval "$line"
         free_device $SUBCHANNELS
     done
+    for line in $(LANG=C grep -E -i -h \
+	"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){2,3}$" \
+	$( (ls /etc/NetworkManager/system-connections/*.nmconnection 2> /dev/null ||  echo "__no_config_file") | \
+        LC_ALL=C sed -e "$__sed_discard_ignored_files") 2> /dev/null)
+    do
+	SUBCHANNELS="$(echo $line | sed -e "s/s390-subchannels=//" -e "s/;/,/g")"
+        free_device $SUBCHANNELS
+    done
 fi
 
 [ -z "$ALL_DEVICES" ] && exit 0

device_cio_free.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=Free all devices on startup
 DefaultDependencies=no
-Before=sysinit.target
+Before=sysinit.target systemd-udev-trigger.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/sbin/device_cio_free
-StandardOutput=syslog
 
 [Install]
 WantedBy=sysinit.target

rpminspect.yaml

@@ -0,0 +1,9 @@
+---
+pathmigration:
+    excluded_paths:
+        - /lib/s390-tools
+
+badfuncs:
+    allowed:
+        /usr/bin/qethqoat:
+            - inet_ntoa

s390-tools-cleanup.patch

@@ -1,241 +0,0 @@
-From 1f8c561494e6bbecaaa02ff9cd1b2b9216da59df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Fri, 31 Aug 2018 10:07:35 +0200
-Subject: [PATCH 1/4] drop LOADLIBES variable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove depreciated LOADLIBES variable from the Makefile rules, LDLIBS serves
-the same purpose these days.
-
-Signed-off-by: Dan Horák <dan@danny.cz>
----
- common.mak         |  2 +-
- cpuplugd/Makefile  |  2 +-
- ipl_tools/Makefile |  2 +-
- vmconvert/Makefile |  2 +-
- vmur/Makefile      |  2 +-
- ziomon/Makefile    | 10 +++++-----
- 6 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/common.mak b/common.mak
-index 7d11b10..6029687 100644
---- a/common.mak
-+++ b/common.mak
-@@ -240,7 +240,7 @@ endif
- 	$(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -c $< -o $@
- 
- %: %.o
--	$(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- %.a:
- 	$(AR) rcs $@ $^
-diff --git a/cpuplugd/Makefile b/cpuplugd/Makefile
-index a9a49ab..916638d 100644
---- a/cpuplugd/Makefile
-+++ b/cpuplugd/Makefile
-@@ -7,7 +7,7 @@ LDLIBS += -lm
- OBJECTS = daemon.o cpu.o info.o terms.o config.o main.o getopt.o mem.o
- 
- cpuplugd: $(OBJECTS)
--	$(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- clean:
- 	rm -f cpuplugd $(OBJECTS)
-diff --git a/ipl_tools/Makefile b/ipl_tools/Makefile
-index 128ec3e..506d5cd 100644
---- a/ipl_tools/Makefile
-+++ b/ipl_tools/Makefile
-@@ -6,7 +6,7 @@ objects = main.o ccw.o fcp.o system.o shutdown.o \
- 	  cmd_lsshut.o cmd_chshut.o cmd_lsreipl.o cmd_chreipl.o proc.o
- 
- chreipl: $(objects)
--	$(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- lsreipl:
- 	ln -sf chreipl lsreipl
-diff --git a/vmconvert/Makefile b/vmconvert/Makefile
-index 4d0216c..380eb19 100644
---- a/vmconvert/Makefile
-+++ b/vmconvert/Makefile
-@@ -9,7 +9,7 @@ libs =  $(rootdir)/libvmdump/libvmdump.a
- objects = vmconvert.o
- 
- vmconvert: $(objects) $(libs)
--	$(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR) $(DESTDIR)$(MANDIR)/man1
-diff --git a/vmur/Makefile b/vmur/Makefile
-index 1a6bddc..2c1c2d5 100644
---- a/vmur/Makefile
-+++ b/vmur/Makefile
-@@ -11,7 +11,7 @@ libs =  $(rootdir)/libvmdump/libvmdump.a \
- objects = vmur.o
- 
- vmur: $(objects) $(libs)
--	$(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(USRSBINDIR) $(DESTDIR)$(MANDIR)/man8
-diff --git a/ziomon/Makefile b/ziomon/Makefile
-index 778401b..61c2399 100644
---- a/ziomon/Makefile
-+++ b/ziomon/Makefile
-@@ -12,33 +12,33 @@ ziomon_mgr_main.o: ziomon_mgr.c
- ziomon_mgr: LDLIBS += -lm
- ziomon_mgr: ziomon_dacc.o ziomon_util.o ziomon_mgr_main.o ziomon_tools.o \
- 	    ziomon_zfcpdd.o ziomon_msg_tools.o
--	$(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- ziomon_util_main.o: ziomon_util.c ziomon_util.h
- 	$(CC) -DWITH_MAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) -c $< -o $@
- ziomon_util: LDLIBS += -lm
- ziomon_util: ziomon_util_main.o ziomon_tools.o
--	$(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- ziomon_zfcpdd_main.o: ziomon_zfcpdd.c ziomon_zfcpdd.h
- 	$(CC) -DWITH_MAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) -c $< -o $@
- ziomon_zfcpdd: LDLIBS += -lm -lrt -lpthread
- ziomon_zfcpdd: ziomon_zfcpdd_main.o ziomon_tools.o
--	$(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- ziorep_traffic: ziorep_traffic.o ziorep_framer.o ziorep_frameset.o \
- 		ziorep_printers.o ziomon_dacc.o ziomon_util.o \
- 		ziomon_msg_tools.o ziomon_tools.o ziomon_zfcpdd.o \
- 		ziorep_cfgreader.o ziorep_collapser.o ziorep_utils.o \
- 		ziorep_filters.o
--	$(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- ziorep_utilization: ziorep_utilization.o ziorep_framer.o ziorep_frameset.o \
- 		    ziorep_printers.o ziomon_dacc.o ziomon_util.o \
- 		    ziomon_msg_tools.o ziomon_tools.o ziomon_zfcpdd.o \
- 		    ziorep_cfgreader.o ziorep_collapser.o ziorep_utils.o \
- 		    ziorep_filters.o
--	$(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- install: all
- 	$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
--- 
-2.17.1
-
-
-From fb5268e46eac79cfdf683ddfff6d685df6008b38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Fri, 31 Aug 2018 10:13:38 +0200
-Subject: [PATCH 2/4] zkey: Drop redundant include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Dan Horák <dan@danny.cz>
----
- zkey/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/zkey/Makefile b/zkey/Makefile
-index 68f35cf..725cb3b 100644
---- a/zkey/Makefile
-+++ b/zkey/Makefile
-@@ -22,7 +22,6 @@ else
- 	INSTALL_TARGETS += zkey-cryptsetup-skip-cryptsetup2
- endif
- 
--CPPFLAGS += -I../include
- LIBS = $(rootdir)/libutil/libutil.a
- 
- detect-libcryptsetup.h:
--- 
-2.17.1
-
-
-From 577cbdaee51c0104465e4b77e5d931f8232d92e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Fri, 31 Aug 2018 10:17:07 +0200
-Subject: [PATCH 3/4] zkey: Be consistent when refering to libutil.a
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Dan Horák <dan@danny.cz>
----
- zkey/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/zkey/Makefile b/zkey/Makefile
-index 725cb3b..7e2047a 100644
---- a/zkey/Makefile
-+++ b/zkey/Makefile
-@@ -22,7 +22,7 @@ else
- 	INSTALL_TARGETS += zkey-cryptsetup-skip-cryptsetup2
- endif
- 
--LIBS = $(rootdir)/libutil/libutil.a
-+libs = $(rootdir)/libutil/libutil.a
- 
- detect-libcryptsetup.h:
- 	echo "#include <libcryptsetup.h>" > detect-libcryptsetup.h
-@@ -69,10 +69,10 @@ keystore.o: keystore.c keystore.h properties.h
- zkey-cryptsetup.o: check-dep-zkey-cryptsetup zkey-cryptsetup.c pkey.h misc.h
- 
- zkey: LDLIBS = -ldl -lcrypto
--zkey: zkey.o pkey.o properties.o keystore.o $(LIBS)
-+zkey: zkey.o pkey.o properties.o keystore.o $(libs)
- 
- zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c
--zkey-cryptsetup: zkey-cryptsetup.o pkey.o $(LIBS)
-+zkey-cryptsetup: zkey-cryptsetup.o pkey.o $(libs)
- 
- install-common:
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR)
--- 
-2.17.1
-
-
-From b474b9d1a567e132f79c2a17ebbc3b56794e4797 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Fri, 31 Aug 2018 04:29:39 -0400
-Subject: [PATCH 4/4] zkey: Be explicit about linking the tools
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I've met cases when the make's default rule for linking was used instead omitting
-the ALL_LDFLAGS variable. The linking rule from common.mak is defined for linking
-*.o files only, here we have libutil.a too.
-
-Signed-off-by: Dan Horák <dan@danny.cz>
----
- zkey/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/zkey/Makefile b/zkey/Makefile
-index 7e2047a..901ddd4 100644
---- a/zkey/Makefile
-+++ b/zkey/Makefile
-@@ -70,9 +70,11 @@ zkey-cryptsetup.o: check-dep-zkey-cryptsetup zkey-cryptsetup.c pkey.h misc.h
- 
- zkey: LDLIBS = -ldl -lcrypto
- zkey: zkey.o pkey.o properties.o keystore.o $(libs)
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c
- zkey-cryptsetup: zkey-cryptsetup.o pkey.o $(libs)
-+	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
- 
- install-common:
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR)
--- 
-2.17.1
-

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

@@ -0,0 +1,348 @@
+From b2daaa34776ba6afec879e362378f6f7563590a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 20 Jun 2022 17:43:05 +0200
+Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
+ versions"
+
+This reverts commit a0dba6bfdb50ff373fa710ffe2a307cc0748f18b.
+---
+ zipl/src/scan.c | 139 ++----------------------------------------------
+ 1 file changed, 3 insertions(+), 136 deletions(-)
+
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 0cea1d4..9352f76 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -10,7 +10,6 @@
+  *
+  */
+ 
+-static const char *VERSION_KEYWORD = "version";
+ 
+ /* Need ISOC99 function isblank() in ctype.h */
+ #ifndef __USE_ISOC99
+@@ -646,7 +645,7 @@ scan_file(const char* filename, struct scan_token** token)
+ 
+ 
+ static int
+-bls_filter_by_names(const struct dirent *ent)
++bls_filter(const struct dirent *ent)
+ {
+ 	int offset = strlen(ent->d_name) - strlen(".conf");
+ 
+@@ -656,111 +655,13 @@ bls_filter_by_names(const struct dirent *ent)
+ 	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
+ }
+ 
+-struct version {
+-	char *line; /* pointer to a line with version keyword */
+-	int offset; /* offset of version value in the line */
+-};
+-
+-/*
+- * Locate version in bls file represented by ENT
+- */
+-static void get_version(const struct dirent *ent, struct version *v)
+-{
+-	char *line = NULL;
+-	size_t len = 0;
+-	char *d_name;
+-	FILE *stream;
+-	ssize_t read;
+-
+-	memset(v, 0, sizeof(*v));
+-	d_name = misc_make_path((char *)blsdir, (char *)ent->d_name);
+-	if (!d_name)
+-		return;
+-
+-	stream = fopen(d_name, "r");
+-	free(d_name);
+-	if (!stream)
+-		return;
+-
+-	while ((read = getline(&line, &len, stream)) != -1) {
+-		if (line[read - 1] == '\n') {
+-			line[read - 1] = '\0';
+-			read--;
+-		}
+-		if ((size_t)read <= strlen(VERSION_KEYWORD) + 1)
+-			continue;
+-		if (strcmp(VERSION_KEYWORD, line) > 0)
+-			continue;
+-		if (!isblank(line[strlen(VERSION_KEYWORD)]))
+-			continue;
+-		/* skip blanks */
+-		v->offset = strlen(VERSION_KEYWORD) + 1;
+-		while (v->offset < read - 1 && isblank(line[v->offset]))
+-			v->offset++;
+-		if (isblank(line[v->offset]))
+-			/*
+-			 * all characters after the keyword
+-			 * are blanks. Invalid version
+-			 */
+-			continue;
+-		v->line = line;
+-		fclose(stream);
+-		return;
+-	}
+-	free(line);
+-	fclose(stream);
+-}
+-
+-static void put_version(struct version *v)
+-{
+-	free(v->line);
+-}
+-
+-/**
+- * Check version in bls file represented by ENT.
+- * Return 1 if version is valid. Otherwise return 0
+- */
+-static int bls_filter_by_versions(const struct dirent *ent)
+-{
+-	struct version v;
+-
+-	if (bls_filter_by_names(ent) == 0)
+-		return 0;
+-
+-	get_version(ent, &v);
+-	if (v.line) {
+-		put_version(&v);
+-		return 1;
+-	}
+-	return 0;
+-}
+-
+ 
+ static int
+-bls_sort_by_names(const struct dirent **ent_a, const struct dirent **ent_b)
++bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
+ {
+ 	return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
+ }
+ 
+-static int
+-bls_sort_by_versions(const struct dirent **ent_a, const struct dirent **ent_b)
+-{
+-	struct version v1, v2;
+-	int ret;
+-
+-	get_version(*ent_a, &v1);
+-	get_version(*ent_b, &v2);
+-	/*
+-	 * Both versions are valid.
+-	 * It is guaranteed by bls_filter_by_versions()
+-	 */
+-	ret = strverscmp(v1.line + v1.offset, v2.line + v2.offset);
+-
+-	put_version(&v1);
+-	put_version(&v2);
+-
+-	return ret;
+-}
+ 
+ static int
+ scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+@@ -1110,40 +1011,6 @@ scan_count_target_keywords(char* keyword[])
+ 	return num;
+ }
+ 
+-static int bls_scandir(struct dirent ***bls_entries)
+-{
+-	struct dirent **entries1;
+-	struct dirent **entries2;
+-	int n1, n2;
+-
+-	/* arrange by names */
+-	n1 = scandir(blsdir, &entries1,
+-		     bls_filter_by_names, bls_sort_by_names);
+-	if (n1 <= 0)
+-		return n1;
+-	/* arrange by versions */
+-	n2 = scandir(blsdir, &entries2,
+-		     bls_filter_by_versions, bls_sort_by_versions);
+-
+-	if (n2 <= 0 || n2 < n1) {
+-		/*
+-		 * failed to sort by versions,
+-		 * fall back to sorting by filenames
+-		 */
+-		*bls_entries = entries1;
+-		while (n2--)
+-			free(entries2[n2]);
+-		free(entries2);
+-		return n1;
+-	}
+-	/* use arrangement by versions */
+-	*bls_entries = entries2;
+-	while (n1--)
+-		free(entries1[n1]);
+-	free(entries1);
+-	return n2;
+-}
+-
+ int
+ scan_check_target_data(char* keyword[], int* line)
+ {
+@@ -1464,7 +1331,7 @@ int scan_bls(struct scan_token **token, int scan_size)
+ 	if (!(stat(blsdir, &sb) == 0 && S_ISDIR(sb.st_mode)))
+ 		return 0;
+ 
+-	n = bls_scandir(&bls_entries);
++	n = scandir(blsdir, &bls_entries, bls_filter, bls_sort);
+ 	if (n <= 0)
+ 		return n;
+ 
+-- 
+2.39.2
+
+
+From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 20 Jun 2022 17:46:59 +0200
+Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Dan Horák <dan@danny.cz>
+---
+ zipl/src/Makefile |  1 +
+ zipl/src/scan.c   | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 95 insertions(+), 2 deletions(-)
+
+diff --git a/zipl/src/Makefile b/zipl/src/Makefile
+index cab5655..7ec215d 100644
+--- a/zipl/src/Makefile
++++ b/zipl/src/Makefile
+@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+ 
+ libs =  $(rootdir)/libutil/libutil.a \
+ 	$(rootdir)/libvtoc/libvtoc.a \
++	-lrpmio -lrpm
+ 
+ objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
+ 	  bootmap_header.o envblk.o install.o zipl.o
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 9352f76..3327e2d 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -35,6 +35,8 @@
+ 
+ #include "lib/util_base.h"
+ 
++#include <rpm/rpmlib.h>
++
+ #include "boot.h"
+ #include "error.h"
+ #include "misc.h"
+@@ -655,13 +657,103 @@ bls_filter(const struct dirent *ent)
+ 	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
+ }
+ 
++/* returns name/version/release */
++/* NULL string pointer returned if nothing found */
++static void
++split_package_string (char *package_string, char **name,
++                     char **version, char **release)
++{
++	char *package_version, *package_release;
++
++	/* Release */
++	package_release = strrchr (package_string, '-');
++
++	if (package_release != NULL)
++		*package_release++ = '\0';
++
++	*release = package_release;
++
++	/* Version */
++	package_version = strrchr(package_string, '-');
++
++	if (package_version != NULL)
++		*package_version++ = '\0';
++
++	*version = package_version;
++	/* Name */
++	*name = package_string;
++
++	/* Bubble up non-null values from release to name */
++	if (name != NULL && *name == NULL) {
++		*name = (*version == NULL ? *release : *version);
++		*version = *release;
++		*release = NULL;
++	}
++	if (*version == NULL) {
++		*version = *release;
++		*release = NULL;
++	}
++}
+ 
+ static int
+-bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
++split_cmp(char *nvr0, char *nvr1, int has_name)
++{
++	int ret = 0;
++	char *name0, *version0, *release0;
++	char *name1, *version1, *release1;
++
++	split_package_string(nvr0, has_name ? &name0 : NULL, &version0, &release0);
++	split_package_string(nvr1, has_name ? &name1 : NULL, &version1, &release1);
++
++	if (has_name) {
++		ret = rpmvercmp(name0 == NULL ? "" : name0,
++                                name1 == NULL ? "" : name1);
++		if (ret != 0)
++			return ret;
++	}
++
++	ret = rpmvercmp(version0 == NULL ? "" : version0,
++                        version1 == NULL ? "" : version1);
++	if (ret != 0)
++		return ret;
++
++	ret = rpmvercmp(release0 == NULL ? "" : release0,
++                        release1 == NULL ? "" : release1);
++	return ret;
++}
++
++/* return 1: filename0 is newer than filename1 */
++/*        0: filename0 and filename1 are the same version */
++/*       -1: filename1 is newer than filename0 */
++static int bls_cmp(const char *filename0, const char *filename1)
+ {
+-	return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
++	char *id0, *id1;
++	int l, r;
++
++	id0 = strdup(filename0);
++	id1 = strdup(filename1);
++
++	l = strlen(id0);
++	if (l > 5 && strcmp(id0 + l - 5, ".conf"))
++		id0[l-5] = '\0';
++
++	l = strlen(id1);
++	if (l > 5 && strcmp(id1 + l - 5, ".conf"))
++		id1[l-5] = '\0';
++
++	r = split_cmp(id0, id1, 1);
++
++	free(id0);
++	free(id1);
++
++	return r;
+ }
+ 
++static int
++bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
++{
++	return bls_cmp((*ent_a)->d_name, (*ent_b)->d_name);
++}
+ 
+ static int
+ scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+-- 
+2.39.2
+

s390-tools-zipl-fiemap.patch

@@ -1,106 +0,0 @@
-From 0318dfbc726a82ce1e9309e55186f3c4faae72f1 Mon Sep 17 00:00:00 2001
-From: Eric Sandeen <sandeen@sandeen.net>
-Date: Wed, 12 Sep 2018 09:40:22 -0500
-Subject: [PATCH] zipl: use FIEMAP mapping ioctl if it exists
-
-zipl currently uses the FIBMAP ioctl to map blocks for the bootloader;
-on XFS, if FIBMAP is requested on a reflinked file, it will fail -
-and FIBMAP returns 0 in this case, which is indistinguishable from a
-hole.  This causes boot to fail because the file is not mapped.
-
-We can use the FIEMAP ioctl instead, which is able to map reflinked
-files.  While FIEMAP is able to map entire extents at once, here we
-simply use it to obtain the mapping block-by-block so that it fits
-in with the current FIBMAP calls.
-
-Signed-off-by: Eric Sandeen <sandeen@redhat.com>
----
- zipl/src/disk.c | 57 +++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 53 insertions(+), 4 deletions(-)
-
-diff --git a/zipl/src/disk.c b/zipl/src/disk.c
-index 0d8e7796..43092bf1 100644
---- a/zipl/src/disk.c
-+++ b/zipl/src/disk.c
-@@ -21,6 +21,8 @@
- #include <sys/sysmacros.h>
- #include <sys/vfs.h>
- #include <unistd.h>
-+#include <linux/fs.h>
-+#include <linux/fiemap.h>
- 
- #include "lib/util_proc.h"
- 
-@@ -550,8 +552,12 @@ disk_get_blocknum(int fd, int fd_is_basedisk, blocknum_t logical,
- {
- 	struct statfs buf;
- 	blocknum_t phy_per_fs;
--	int mapped;
-+	blocknum_t mapped;
-+	int block;
- 	int subblock;
-+	int fiemap_size;
-+	int map_offset;
-+	struct fiemap *fiemap;
- 
- 	/* No file system: partition or raw disk */
- 	if (info->fs_block_size == -1) {
-@@ -576,12 +582,55 @@ disk_get_blocknum(int fd, int fd_is_basedisk, blocknum_t logical,
- 	}
- 	/* Get mapping in file system blocks */
- 	phy_per_fs = info->fs_block_size / info->phy_block_size;
--	mapped = logical / phy_per_fs;
- 	subblock = logical % phy_per_fs;
--	if (ioctl(fd, FIBMAP, &mapped)) {
--		error_reason("Could not get file mapping");
-+
-+	/* First try FIEMAP, more complicated to set up */
-+	fiemap_size = sizeof(struct fiemap) + sizeof(struct fiemap_extent);
-+
-+	fiemap = misc_malloc(fiemap_size);
-+	if (!fiemap)
- 		return -1;
-+	memset(fiemap, 0, fiemap_size);
-+
-+	fiemap->fm_extent_count = 1;
-+	fiemap->fm_flags = FIEMAP_FLAG_SYNC;
-+	/* fm_start, fm_length in bytes; logical is in physical block units */
-+	fiemap->fm_start = logical * info->phy_block_size;
-+	fiemap->fm_length = info->phy_block_size;
-+
-+	if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long)fiemap)) {
-+		/* FIEMAP failed, fall back to FIBMAP */
-+		block = logical / phy_per_fs;
-+		if (ioctl(fd, FIBMAP, &block)) {
-+			error_reason("Could not get file mapping");
-+			free(fiemap);
-+			return -1;
-+		}
-+		mapped = block;
-+	} else {
-+		if (fiemap->fm_mapped_extents) {
-+			if (fiemap->fm_extents[0].fe_flags &
-+			    FIEMAP_EXTENT_ENCODED) {
-+				error_reason("File mapping is encoded");
-+				free(fiemap);
-+				return -1;
-+			}
-+			/*
-+			 * returned extent may start prior to our request
-+			 */
-+			map_offset = fiemap->fm_start -
-+				     fiemap->fm_extents[0].fe_logical;
-+			mapped = fiemap->fm_extents[0].fe_physical +
-+				 map_offset;
-+			/* set mapped to fs block units */
-+			mapped = mapped / info->fs_block_size;
-+		} else {
-+			mapped = 0;
-+		}
- 	}
-+
-+	free(fiemap);
-+
- 	if (mapped == 0) {
- 		/* This is a hole in the file */
- 		*physical = 0;

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

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

sources

@@ -1,3 +1,2 @@
-SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0
-SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7
-SHA512 (s390-tools-2.6.0.tar.gz) = 0f35eae85896c4fbc784d0e0549c7856741e7d8ba979f2897c6f546987485d19019dac36b9443d2ff10f8da3128de2203c7526fac480756388fc61380a93536e
+SHA512 (s390-tools-2.40.0.tar.gz) = 1943429581b280bf9ea370da3700a234d509837cb45b2354cdf79b38db87d2183010d18d9132defd77b9d8e11b7e002c447ffd7c912e20a50da4cb6877758c0e
+SHA512 (s390-tools-2.40.0-rust-vendor.tar.xz) = fd1894c4e950a3c51054432731a3aeef4318e794aa4af2dc5fed31da16dce2020f014a64241e44766fb40b0fd6c1ac5943366e38dcfebf264875220ecf1285b5

zfcpconf.sh

@@ -2,10 +2,12 @@
 
 # config file syntax:
 # deviceno   WWPN   FCPLUN
+# deviceno			# allowed when auto LUN scan is enabled and port is in NPIV mode
 #
 # Example:
 # 0.0.4000 0x5005076300C213e9 0x5022000000000000 
 # 0.0.4001 0x5005076300c213e9 0x5023000000000000 
+# 0.0.5000
 #
 #
 # manual setup:
@@ -21,12 +23,20 @@
 CONFIG=/etc/zfcp.conf
 PATH=/bin:/sbin
 
+set_online()
+{
+   DEVICE=$1
+
+   [ `cat /sys/bus/ccw/drivers/zfcp/${DEVICE}/online` = "0" ] \
+      && echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE}/online
+}
+
 if [ -f "$CONFIG" ]; then
    if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
       modprobe zfcp
    fi
    if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
-      return
+      exit 1
    fi
    sed 'y/ABCDEF/abcdef/' < $CONFIG | while read line; do
        case $line in
@@ -34,6 +44,17 @@ if [ -f "$CONFIG" ]; then
 	   *)
 	       [ -z "$line" ] && continue
 	       set $line
+	       if [ $# -eq 1 ]; then
+		   DEVICE=${1##*0x}
+		   if [ `cat /sys/module/zfcp/parameters/allow_lun_scan` = "Y" ]; then
+		      set_online ${DEVICE}
+		      grep -q NPIV /sys/bus/ccw/devices/${DEVICE}/host*/fc_host/host*/port_type || \
+		         echo "Error: Only device ID (${DEVICE}) given, but port not in NPIV mode"
+		   else
+		      echo "Error: Only device ID (${DEVICE}) given, but LUN scan is disabled for the zfcp module"
+		   fi
+		   continue
+	       fi
 	       if [ $# -eq 5 ]; then
 		   DEVICE=$1
 		   SCSIID=$2
@@ -46,11 +67,11 @@ if [ -f "$CONFIG" ]; then
 		   WWPN=$2
 		   FCPLUN=$3
 	       fi
-               [ `cat /sys/bus/ccw/drivers/zfcp/${DEVICE}/online` = "0" ] \
-                   && echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE}/online
+	       set_online ${DEVICE}
 	       [ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/${FCPLUN} ] \
 		   && echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/unit_add
 	       ;;
        esac
    done
 fi
+exit 0