Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package s390-tools for openSUSE:Factory checked in at 2023-06-14 16:31:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/s390-tools (Old) and /work/SRC/openSUSE:Factory/.s390-tools.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s390-tools" Wed Jun 14 16:31:33 2023 rev:62 rq:1093106 version:2.27.0 Changes: -------- --- /work/SRC/openSUSE:Factory/s390-tools/s390-tools.changes 2023-05-04 17:11:26.328668576 +0200 +++ /work/SRC/openSUSE:Factory/.s390-tools.new.15902/s390-tools.changes 2023-06-14 16:32:39.515692356 +0200 @@ -1,0 +2,53 @@ +Wed Jun 14 11:24:27 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorgu...@suse.com> + +- Upgrade to version 2.27.0 (jsc#PED-3275) +- 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 +- Amended the .patches to fit the 2.27 version +- Removed obsolete patches (the fixes are included in this version) + * s390-tools-sles15sp5-zipl-boot-disable-Warray-bounds-for-now.patch + * s390-tools-sles15sp5-zkey-Support-EP11-host-library-version-4.patch + * s390-tools-sles15sp5-01-zipl-boot-discard-.eh_frame-and-.interp-input-sectio.patch + * s390-tools-sles15sp5-02-zipl-boot-declare-that-no-executable-stack-is-requir.patch + * s390-tools-sles15sp5-03-zipl-boot-use-no-warn-rwx-segments-linker-flag.patch + * s390-tools-sles15sp5-04-zipl-boot-disable-build-id.patch + * s390-tools-sles15sp5-05-zipl-boot-simplify-objcopy-commands.patch + * s390-tools-sles15sp5-06-zipl-move-STAGE2_MAX_SIZE-and-STAGE1B_LOAD_ADDR-to-l.patch + * s390-tools-sles15sp5-07-zipl-boot-use-linker-scripts-for-all-bootloaders.patch + * s390-tools-sles15sp5-08-genprotimg-boot-declare-that-no-executable-stack-is-.patch + * s390-tools-sles15sp5-09-genprotimg-boot-use-no-warn-rwx-segments-linker-flag.patch + * s390-tools-sles15sp5-10-genprotimg-boot-disable-build-id.patch + * s390-tools-sles15sp5-11-genprotimg-boot-Makefile-simplify-objcopy-command.patch + * s390-tools-sles15sp5-12-genprotimg-boot-improve-linker-scripts.patch + * s390-tools-sles15sp5-13-genprotimg-boot-stage3b-add-size-check-to-the-linker.patch + * s390-tools-sles15sp5-14-genprotimg-boot-stage3b_reloc.bin-add-linker-script.patch + * s390-tools-sles15sp5-15-zipl-Embed-loader-data-directly-into-boot-object.patch + * s390-tools-sles15sp5-lszcrypt-use-separate-index-for-inner-sub-device-loo.patch + * s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch + * s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch + * s390-tools-sles15sp5-fix-chown-commands-syntax.patch + +------------------------------------------------------------------- Old: ---- s390-tools-2.25.0.tar.gz s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch s390-tools-sles15sp5-01-zipl-boot-discard-.eh_frame-and-.interp-input-sectio.patch s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch s390-tools-sles15sp5-02-zipl-boot-declare-that-no-executable-stack-is-requir.patch s390-tools-sles15sp5-03-zipl-boot-use-no-warn-rwx-segments-linker-flag.patch s390-tools-sles15sp5-04-zipl-boot-disable-build-id.patch s390-tools-sles15sp5-05-zipl-boot-simplify-objcopy-commands.patch s390-tools-sles15sp5-06-zipl-move-STAGE2_MAX_SIZE-and-STAGE1B_LOAD_ADDR-to-l.patch s390-tools-sles15sp5-07-zipl-boot-use-linker-scripts-for-all-bootloaders.patch s390-tools-sles15sp5-08-genprotimg-boot-declare-that-no-executable-stack-is-.patch s390-tools-sles15sp5-09-genprotimg-boot-use-no-warn-rwx-segments-linker-flag.patch s390-tools-sles15sp5-10-genprotimg-boot-disable-build-id.patch s390-tools-sles15sp5-11-genprotimg-boot-Makefile-simplify-objcopy-command.patch s390-tools-sles15sp5-12-genprotimg-boot-improve-linker-scripts.patch s390-tools-sles15sp5-13-genprotimg-boot-stage3b-add-size-check-to-the-linker.patch s390-tools-sles15sp5-14-genprotimg-boot-stage3b_reloc.bin-add-linker-script.patch s390-tools-sles15sp5-15-zipl-Embed-loader-data-directly-into-boot-object.patch s390-tools-sles15sp5-fix-chown-commands-syntax.patch s390-tools-sles15sp5-lszcrypt-use-separate-index-for-inner-sub-device-loo.patch s390-tools-sles15sp5-zipl-boot-disable-Warray-bounds-for-now.patch s390-tools-sles15sp5-zkey-Support-EP11-host-library-version-4.patch New: ---- s390-tools-2.27.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools.spec ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:41.047701772 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:41.063701871 +0200 @@ -33,7 +33,7 @@ %endif Name: s390-tools -Version: 2.25.0 +Version: 2.27.0 Release: 0 Summary: S/390 tools like zipl and dasdfmt License: MIT @@ -129,8 +129,7 @@ ### # IBM patches -Patch001: s390-tools-sles15sp5-zipl-boot-disable-Warray-bounds-for-now.patch -Patch002: s390-tools-sles15sp5-zkey-Support-EP11-host-library-version-4.patch +### # SUSE patches Patch900: s390-tools-sles12-zipl_boot_msg.patch Patch901: s390-tools-sles15-sysconfig-compatible-dumpconf.patch @@ -148,32 +147,9 @@ Patch909: s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl.patch Patch910: s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.patch Patch911: s390-tools-sles15sp5-remove-no-pie-link-arguments.patch -# Bug 1208527, and bug 1206173 -Patch912: s390-tools-sles15sp5-01-zipl-boot-discard-.eh_frame-and-.interp-input-sectio.patch -Patch913: s390-tools-sles15sp5-02-zipl-boot-declare-that-no-executable-stack-is-requir.patch -Patch914: s390-tools-sles15sp5-03-zipl-boot-use-no-warn-rwx-segments-linker-flag.patch -Patch915: s390-tools-sles15sp5-04-zipl-boot-disable-build-id.patch -Patch916: s390-tools-sles15sp5-05-zipl-boot-simplify-objcopy-commands.patch -Patch917: s390-tools-sles15sp5-06-zipl-move-STAGE2_MAX_SIZE-and-STAGE1B_LOAD_ADDR-to-l.patch -Patch918: s390-tools-sles15sp5-07-zipl-boot-use-linker-scripts-for-all-bootloaders.patch -Patch919: s390-tools-sles15sp5-08-genprotimg-boot-declare-that-no-executable-stack-is-.patch -Patch920: s390-tools-sles15sp5-09-genprotimg-boot-use-no-warn-rwx-segments-linker-flag.patch -Patch921: s390-tools-sles15sp5-10-genprotimg-boot-disable-build-id.patch -Patch922: s390-tools-sles15sp5-11-genprotimg-boot-Makefile-simplify-objcopy-command.patch -Patch923: s390-tools-sles15sp5-12-genprotimg-boot-improve-linker-scripts.patch -Patch924: s390-tools-sles15sp5-13-genprotimg-boot-stage3b-add-size-check-to-the-linker.patch -Patch925: s390-tools-sles15sp5-14-genprotimg-boot-stage3b_reloc.bin-add-linker-script.patch -Patch926: s390-tools-sles15sp5-15-zipl-Embed-loader-data-directly-into-boot-object.patch -# Bug 1209196 -Patch927: s390-tools-sles15sp5-lszcrypt-use-separate-index-for-inner-sub-device-loo.patch # -Patch928: s390-tools-ALP-zdev-live.patch -# Bug 1211008 -Patch929: s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch -Patch930: s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch - +Patch999: s390-tools-ALP-zdev-live.patch # -Patch999: s390-tools-sles15sp5-fix-chown-commands-syntax.patch BuildRequires: curl-devel BuildRequires: dracut @@ -680,6 +656,7 @@ %dir %{_datadir}/s390-tools/netboot %dir %{_datadir}/s390-tools/genprotimg %dir %{_prefix}/lib/dracut/modules.d/95zdev +%dir %{_prefix}/lib/dracut/modules.d/95zdev-kdump %dir %{_prefix}/lib/dracut/modules.d/96zdev-live %dir %{_prefix}/lib/dracut/modules.d/99ngdump %dir /boot/zipl ++++++ s390-tools-2.25.0.tar.gz -> s390-tools-2.27.0.tar.gz ++++++ ++++ 12425 lines of diff (skipped) ++++++ s390-tools-ALP-zdev-live.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.423710230 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.427710255 +0200 @@ -1,134 +1,134 @@ --- - zdev/dracut/96zdev-live/module-setup.sh | 32 +++++++++++++++++++++++++ - zdev/dracut/96zdev-live/parse-zdev-live.sh | 36 +++++++++++++++++++++++++++++ - zdev/dracut/96zdev-live/write-udev-live.sh | 11 ++++++++ - zdev/dracut/Makefile | 15 ++++++++++-- - 4 files changed, 92 insertions(+), 2 deletions(-) + zdev/dracut/96zdev-live/module-setup.sh | 32 +++++++++++++++++++++++++ + zdev/dracut/96zdev-live/parse-zdev-live.sh | 36 +++++++++++++++++++++++++++++ + zdev/dracut/96zdev-live/write-udev-live.sh | 11 ++++++++ + zdev/dracut/Makefile | 15 ++++++++++-- + 4 files changed, 92 insertions(+), 2 deletions(-) ---- /dev/null -+++ b/zdev/dracut/96zdev-live/module-setup.sh -@@ -0,0 +1,32 @@ -+#!/bin/bash -+ -+# called by dracut -+check() { -+ arch=${DRACUT_ARCH:-$(uname -m)} -+ [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 -+ -+ require_binaries chzdev || return 1 -+ -+ [[ $hostonly ]] || return 0 -+ -+ # or on request -+ return 255 -+} -+ -+# called by dracut -+depends() { -+ echo bash -+ return 0 -+} -+ -+# called by dracut -+installkernel() { -+ instmods ctcm lcs qeth qeth_l2 qeth_l3 dasd_diag_mod dasd_eckd_mod dasd_fba_mod -+} -+ -+# called by dracut -+install() { -+ inst_hook cmdline 41 "$moddir/parse-zdev-live.sh" -+ inst_hook cleanup 41 "$moddir/write-udev-live.sh" -+ inst_multiple chzdev -+} ---- /dev/null -+++ b/zdev/dracut/96zdev-live/parse-zdev-live.sh -@@ -0,0 +1,36 @@ -+#!/bin/bash -+# -+# 96zdev-live/parse-zdev-live.sh -+# Parse the kernel command line for rd.zdev kernel parameters. These -+# parameters are evaluated and used to configure z Systems specific devices -+# with chzdev(8), especially for use on live/installation type media. -+# Note: this is only active on no-hostonly initrds (by default). -+# -+# Format: -+# rd.zdev=TYPE,DEVICE[,SETTINGS] -+# -+# where -+# -+# TYPE: all device types supported by chzdev(8), like qeth and dasd -+# DEVICE: device specification as supported by chzdev(8) '--enable', -+# with the exception of specifying multiple devices, which -+# need to be separated by commas. Channel group members -+# (or zFCP parameters) in turn are separated by colons. -+# SETTINGS: Settings are positional arguments of chzdev in the form -+# KEY=VALUE separated by commas. -+ -+zdev_enable="--persistent --enable" -+zdev_base_args="--yes --no-root-update --no-settle" -+ -+for zdevs in $(getargs rd.zdev) ; do -+ IFS=',' read -r -a zdev <<< "$zdevs" -+ if [ -n "$zdev" ] && [ "$zdev" = "no-auto" -o "$zdev" = "auto" ] ; then -+ : # ignore, as it's handled by 95zdev -+ elif [ -z "$zdev" ] || [ -z "${zdev[1]}" ] ; then -+ warn "Unsupported usage of rd.zdev=$zdevs" -+ else -+ info "+ chzdev $zdev_enable [...] ${zdev[@]}" -+ chzdev $zdev_enable $zdev_base_args "${zdev[@]}" -+ fi -+done -+ ---- /dev/null -+++ b/zdev/dracut/96zdev-live/write-udev-live.sh -@@ -0,0 +1,11 @@ -+#!/bin/sh -+# -+# 96zdev-live/write-udev-live.sh -+# Copy udeve rules generated by chzdev for device activation starting with 41 -+# to a *writable* /sysroot -- this is primarily useful for live/installation- -+# type media (and by default only active on no-hostonly initrds) -+# -+ -+if [ -w /sysroot/etc/udev/rules.d ]; then -+ cp -p /etc/udev/rules.d/41-* /sysroot/etc/udev/rules.d -+fi ---- a/zdev/dracut/Makefile -+++ b/zdev/dracut/Makefile -@@ -2,17 +2,23 @@ - include ../../common.mak - - ZDEVDIR := 95zdev -+ZDEVLIVEDIR := 96zdev-live - - # HAVE_DRACUT - # --# This install time parameter determines whether the zdev dracut module is --# installed (HAVE_DRACUT=1) or not (default). When installed, the module -+# This install time parameter determines whether the zdev dracut modules are -+# installed (HAVE_DRACUT=1) or not (default). When installed, the 95zdev module - # performs the following functions when dracut is run: - # - # - copy the persistent root device configuration to the initial ram disk - # - install a boot-time hook to apply firmware-provided configuration data - # to the system - # -+# The 96zdev-live module performs the following functions when dracut is run: -+# -+# - install a boot-time hook to apply command-line-provided configuration data -+# to a no-hostonly built initial ram disk for use in live/installation media -+# - ifeq ($(HAVE_DRACUT),1) - install: - $(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/ -@@ -20,4 +26,9 @@ install: - $(INSTALL) -m 755 $(ZDEVDIR)/module-setup.sh \ - $(ZDEVDIR)/parse-zdev.sh \ - $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVDIR)/ -+ $(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVLIVEDIR) -+ $(INSTALL) -m 755 $(ZDEVLIVEDIR)/module-setup.sh \ -+ $(ZDEVLIVEDIR)/parse-zdev-live.sh \ -+ $(ZDEVLIVEDIR)/write-udev-live.sh \ -+ $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVLIVEDIR)/ - endif +--- /dev/null ++++ b/zdev/dracut/96zdev-live/module-setup.sh +@@ -0,0 +1,32 @@ ++#!/bin/bash ++ ++# called by dracut ++check() { ++ arch=${DRACUT_ARCH:-$(uname -m)} ++ [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 ++ ++ require_binaries chzdev || return 1 ++ ++ [[ $hostonly ]] || return 0 ++ ++ # or on request ++ return 255 ++} ++ ++# called by dracut ++depends() { ++ echo bash ++ return 0 ++} ++ ++# called by dracut ++installkernel() { ++ instmods ctcm lcs qeth qeth_l2 qeth_l3 dasd_diag_mod dasd_eckd_mod dasd_fba_mod ++} ++ ++# called by dracut ++install() { ++ inst_hook cmdline 41 "$moddir/parse-zdev-live.sh" ++ inst_hook cleanup 41 "$moddir/write-udev-live.sh" ++ inst_multiple chzdev ++} +--- /dev/null ++++ b/zdev/dracut/96zdev-live/parse-zdev-live.sh +@@ -0,0 +1,36 @@ ++#!/bin/bash ++# ++# 96zdev-live/parse-zdev-live.sh ++# Parse the kernel command line for rd.zdev kernel parameters. These ++# parameters are evaluated and used to configure z Systems specific devices ++# with chzdev(8), especially for use on live/installation type media. ++# Note: this is only active on no-hostonly initrds (by default). ++# ++# Format: ++# rd.zdev=TYPE,DEVICE[,SETTINGS] ++# ++# where ++# ++# TYPE: all device types supported by chzdev(8), like qeth and dasd ++# DEVICE: device specification as supported by chzdev(8) '--enable', ++# with the exception of specifying multiple devices, which ++# need to be separated by commas. Channel group members ++# (or zFCP parameters) in turn are separated by colons. ++# SETTINGS: Settings are positional arguments of chzdev in the form ++# KEY=VALUE separated by commas. ++ ++zdev_enable="--persistent --enable" ++zdev_base_args="--yes --no-root-update --no-settle" ++ ++for zdevs in $(getargs rd.zdev) ; do ++ IFS=',' read -r -a zdev <<< "$zdevs" ++ if [ -n "$zdev" ] && [ "$zdev" = "no-auto" -o "$zdev" = "auto" ] ; then ++ : # ignore, as it's handled by 95zdev ++ elif [ -z "$zdev" ] || [ -z "${zdev[1]}" ] ; then ++ warn "Unsupported usage of rd.zdev=$zdevs" ++ else ++ info "+ chzdev $zdev_enable [...] ${zdev[@]}" ++ chzdev $zdev_enable $zdev_base_args "${zdev[@]}" ++ fi ++done ++ +--- /dev/null ++++ b/zdev/dracut/96zdev-live/write-udev-live.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh ++# ++# 96zdev-live/write-udev-live.sh ++# Copy udeve rules generated by chzdev for device activation starting with 41 ++# to a *writable* /sysroot -- this is primarily useful for live/installation- ++# type media (and by default only active on no-hostonly initrds) ++# ++ ++if [ -w /sysroot/etc/udev/rules.d ]; then ++ cp -p /etc/udev/rules.d/41-* /sysroot/etc/udev/rules.d ++fi +--- a/zdev/dracut/Makefile ++++ b/zdev/dracut/Makefile +@@ -3,17 +3,23 @@ + + ZDEVDIR := 95zdev + ZDEVKDUMPDIR := 95zdev-kdump ++ZDEVLIVEDIR := 96zdev-live + + # HAVE_DRACUT + # +-# This install time parameter determines whether the zdev dracut module is +-# installed (HAVE_DRACUT=1) or not (default). When installed, the module ++# This install time parameter determines whether the zdev dracut modules are ++# installed (HAVE_DRACUT=1) or not (default). When installed, the 95zdev module + # performs the following functions when dracut is run: + # + # - copy the persistent root device configuration to the initial ram disk + # - install a boot-time hook to apply firmware-provided configuration data + # to the system + # ++# The 96zdev-live module performs the following functions when dracut is run: ++# ++# - install a boot-time hook to apply command-line-provided configuration data ++# to a no-hostonly built initial ram disk for use in live/installation media ++# + ifeq ($(HAVE_DRACUT),1) + install: + $(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/ +@@ -25,4 +31,9 @@ + $(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVKDUMPDIR) + $(INSTALL) -m 755 $(ZDEVKDUMPDIR)/module-setup.sh \ + $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVKDUMPDIR)/ ++ $(INSTALL) -m 755 -d $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVLIVEDIR) ++ $(INSTALL) -m 755 $(ZDEVLIVEDIR)/module-setup.sh \ ++ $(ZDEVLIVEDIR)/parse-zdev-live.sh \ ++ $(ZDEVLIVEDIR)/write-udev-live.sh \ ++ $(DESTDIR)$(DRACUTMODDIR)/$(ZDEVLIVEDIR)/ + endif ++++++ s390-tools-sles12-create-filesystem-links.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.459710451 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.471710526 +0200 @@ -1,5 +1,9 @@ ---- a/etc/udev/rules.d/59-dasd.rules 2016-03-17 06:15:01.000000000 -0400 -+++ b/etc/udev/rules.d/59-dasd.rules 2016-03-23 17:36:26.000000000 -0400 +--- + etc/udev/rules.d/59-dasd.rules | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +--- a/etc/udev/rules.d/59-dasd.rules ++++ b/etc/udev/rules.d/59-dasd.rules @@ -15,7 +15,7 @@ LABEL="dasd_block_end" ++++++ s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.479710574 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.483710600 +0200 @@ -12,11 +12,9 @@ Signed-off-by: Hannes Reinecke <h...@suse.de> --- - fdasd/fdasd.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) + fdasd/fdasd.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c -index 4503d3e..f04dc3d 100644 --- a/fdasd/fdasd.c +++ b/fdasd/fdasd.c @@ -1231,10 +1231,12 @@ ++++++ s390-tools-sles12-update-by_id-links-on-change-and-add-action.patch.suse ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.495710673 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.499710698 +0200 @@ -10,11 +10,9 @@ Signed-off-by: Robert Milasan <rmila...@suse.de> --- - etc/udev/rules.d/59-dasd.rules | 2 +- + etc/udev/rules.d/59-dasd.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/etc/udev/rules.d/59-dasd.rules b/etc/udev/rules.d/59-dasd.rules -index 2b1435c..a08cb7c 100644 --- a/etc/udev/rules.d/59-dasd.rules +++ b/etc/udev/rules.d/59-dasd.rules @@ -6,7 +6,7 @@ @@ -26,7 +24,4 @@ # by-id (hardware serial number) KERNEL=="dasd*[!0-9]", ATTRS{status}=="online", IMPORT{program}="/sbin/dasdinfo -a -e -b $kernel" KERNEL=="dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" --- -1.8.1.4 - ++++++ s390-tools-sles12-zipl_boot_msg.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.527710870 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.551711017 +0200 @@ -1,5 +1,9 @@ ---- s390-tools-1.24.1/zipl/boot/menu.c 2013-12-18 11:11:45.000000000 -0500 -+++ s390-tools-1.24.1/zipl/boot/menu.c 2013-12-18 11:59:18.000000000 -0500 +--- + zipl/boot/menu.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/zipl/boot/menu.c ++++ b/zipl/boot/menu.c @@ -168,8 +168,11 @@ /* print config list */ menu_list(); ++++++ s390-tools-sles15-sysconfig-compatible-dumpconf.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.607711361 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.635711534 +0200 @@ -1,5 +1,9 @@ ---- a/etc/sysconfig/dumpconf 2020-10-15 09:56:15.000000000 -0400 -+++ b/etc/sysconfig/dumpconf 2020-10-27 18:47:23.267333389 -0400 +--- + etc/sysconfig/dumpconf | 162 ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 114 insertions(+), 48 deletions(-) + +--- a/etc/sysconfig/dumpconf ++++ b/etc/sysconfig/dumpconf @@ -1,71 +1,137 @@ +## Path: System/Dumpconf +## Description: Configures the actions which should be performed after a kernel panic @@ -27,13 +31,9 @@ +# * reipl: Re-IPL Linux using setting under /sys/firmware/reipl +# * dump_reipl: First dump Linux, then re-IPL Linux using setting under +# /sys/firmware/reipl - # ++# +ON_PANIC="stop" - --# For the actions "reipl" and "dump_reipl" the DELAY_MINUTES keyword may --# be used to delay the activation of dumpconf. --# Thus potential reipl loops caused by kernel panics --# which persistently occur early in the boot process can be prevented. ++ +## Type: integer(0:300) +## Default: 5 +## ServiceRestart: dumpconf @@ -48,68 +48,52 @@ +# been defined the default action (STOP) is performed. +# +DELAY_MINUTES="5" - --# Dump on CCW device (DASD) and re-IPL after dump is complete. --# The re-IPL device, as specified under "/sys/firmware/reipl", is used. --# The activation of dumpconf is delayed by 5 minutes. ++ +## Type: list(ccw,fcp,nvme) +## Default: "" +## ServiceRestart: dumpconf - # --# ON_PANIC=dump_reipl --# DUMP_TYPE=ccw --# DEVICE=0.0.4e13 --# DELAY_MINUTES=5 ++# +# Define the type, ccw for DASD, fcp for zFCP, or nvme for NVMe Disk. +# +DUMP_TYPE="" - ++ +## Type: string +## Default: "" +## ServiceRestart: dumpconf - # --# Dump on fcp device (SCSI Disk) ++# +# Define the device id for a DASD or SCSI over zFCP dump device. - # --# ON_PANIC=dump --# DUMP_TYPE=fcp --# DEVICE=0.0.4711 --# WWPN=0x5005076303004711 --# LUN=0x4711000000000000 --# BOOTPROG=0 --# BR_LBA=0 -+# For example (DASD and SCSI over zFCP have the same structure): DEVICE=0.0.4711 +# ++# For example (DASD and SCSI over zFCP have the same structure): DEVICE=0.0.4711 + # +DEVICE="" +-# For the actions "reipl" and "dump_reipl" the DELAY_MINUTES keyword may +-# be used to delay the activation of dumpconf. +-# Thus potential reipl loops caused by kernel panics +-# which persistently occur early in the boot process can be prevented. +## Type: string +## Default: "" +## ServiceRestart: dumpconf - # --# Dump on nvme device (NVMe Disk) ++# +# Define the WWPN for a zFCP dump device. - # --# ON_PANIC=dump --# DUMP_TYPE=nvme --# FID=0x00000300 --# NSID=0x00000001 --# BOOTPROG=3 --# BR_LBA=0 ++# +# For example: WWPN=0x5005076303004711 +# +WWPN="" +-# Dump on CCW device (DASD) and re-IPL after dump is complete. +-# The re-IPL device, as specified under "/sys/firmware/reipl", is used. +-# The activation of dumpconf is delayed by 5 minutes. +## Type: string +## Default: "" +## ServiceRestart: dumpconf # --# Use VMDUMP +-# ON_PANIC=dump_reipl +-# DUMP_TYPE=ccw +-# DEVICE=0.0.4e13 +-# DELAY_MINUTES=5 +# Define the LUN for a zFCP dump device. - # --# ON_PANIC=vmcmd --# VMCMD_1="MESSAGE * Starting VMDUMP" --# VMCMD_2="VMDUMP" --# VMCMD_3="IPL 4711" ++# +# For example: LUN=0x4711000000000000 +# +LUN="" @@ -117,33 +101,41 @@ +## Type: integer(0:30) +## Default: "0" +## ServiceRestart: dumpconf - # --# Stop Linux (default) ++# +# Define the Boot program selector for a zFCP dump device. # --# ON_PANIC=stop +-# Dump on fcp device (SCSI Disk) +# A decimal value between 0 and 30 specifying the program to be loaded from +# the FCP-I/O device. -+# + # +-# ON_PANIC=dump +-# DUMP_TYPE=fcp +-# DEVICE=0.0.4711 +-# WWPN=0x5005076303004711 +-# LUN=0x4711000000000000 +-# BOOTPROG=0 +-# BR_LBA=0 +BOOTPROG="0" +## Type: string +## Default: "0" +## ServiceRestart: dumpconf # --# Re-IPL Linux --# The re-IPL device, as specified under "/sys/firmware/reipl", is used. --# Since the DELAY_MINUTES keyword is omitted, there is no delay and --# dumpconf becomes active immediately during system startup. +-# Dump on nvme device (NVMe Disk) +# Define the Boot record logical block address for a zFCP dump device. # --# ON_PANIC=reipl +-# ON_PANIC=dump +-# DUMP_TYPE=nvme +-# FID=0x00000300 +-# NSID=0x00000001 +-# BOOTPROG=3 +-# BR_LBA=0 +# The hexadecimal digits designating the logical-block address of the boot record of the FCP-I/O device. +# It must be a value from 0-FFFFFFFF FFFFFFFF. For values longer than 8 hex characters at least one separator +# blank is required after the 8th character. +# +BR_LBA="0" -+ + +## Type: string +## Default: "" +## ServiceRestart: dumpconf @@ -151,11 +143,16 @@ +# Define the Function ID for NVMe dump device. +# +# The hexadecimal digits designating the Function ID for the NMVe disk. -+# + # +-# Use VMDUMP +# For example: FID=0x00000300 -+# + # +-# ON_PANIC=vmcmd +-# VMCMD_1="MESSAGE * Starting VMDUMP" +-# VMCMD_2="VMDUMP" +-# VMCMD_3="IPL 4711" +FID="" -+ + +## Type: string +## Default: "" +## ServiceRestart: dumpconf @@ -163,21 +160,28 @@ +# Define the Namespace ID for the NVMe dump device +# +# The hexadecimal digits designating the Namespace ID for the NMVe disk. -+# + # +-# Stop Linux (default) +# For example: NSID=0x00000001 -+# + # +-# ON_PANIC=stop +NSID="" -+ + +## Type: string +## Default: "" +## ServiceRestart: dumpconf -+# + # +-# Re-IPL Linux +-# The re-IPL device, as specified under "/sys/firmware/reipl", is used. +-# Since the DELAY_MINUTES keyword is omitted, there is no delay and +-# dumpconf becomes active immediately during system startup. +# VMCMD_<X> +# Specifies a CP command, <X> is a number from one to eight. You can +# specify up to eight CP commands that are executed in case of a kernel +# panic. Note that VM commands, device adresses, and VM guest names +# must be uppercase. -+# + # +-# ON_PANIC=reipl +VMCMD_1="" +VMCMD_2="" +VMCMD_3="" ++++++ s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.663711706 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.683711829 +0200 @@ -37,7 +37,7 @@ --- a/zdev/src/zdev-root-update.dracut +++ b/zdev/src/zdev-root-update.dracut -@@ -20,10 +20,4 @@ dracut -f || { +@@ -20,10 +20,4 @@ exit 1 } ++++++ s390-tools-sles15sp3-Allow-multiple-device-arguments.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.699711927 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.703711951 +0200 @@ -7,15 +7,13 @@ Signed-off-by: Hannes Reinecke <h...@suse.com> --- - dasdfmt/dasdfmt.8 | 5 +- - dasdfmt/dasdfmt.c | 175 ++++++++++++++++++++++++++++++------------------------ - 2 files changed, 100 insertions(+), 80 deletions(-) + dasdfmt/dasdfmt.8 | 5 - + dasdfmt/dasdfmt.c | 197 +++++++++++++++++++++++++++++++----------------------- + 2 files changed, 119 insertions(+), 83 deletions(-) -diff --git a/dasdfmt/dasdfmt.8 b/dasdfmt/dasdfmt.8 -index 99da9ed..e7fc501 100644 --- a/dasdfmt/dasdfmt.8 +++ b/dasdfmt/dasdfmt.8 -@@ -11,14 +11,15 @@ dasdfmt \- formatting of DASD (ECKD) disk drives. +@@ -11,14 +11,15 @@ .br [-r \fIcylinder\fR] [-b \fIblksize\fR] [-l \fIvolser\fR] [-d \fIlayout\fR] .br @@ -33,8 +31,8 @@ .br \fBWARNING\fR: Careless usage of \fBdasdfmt\fR can result in ---- s390-tools-2.15.1/dasdfmt/dasdfmt.c 2020-10-30 20:43:30.853044638 +0000 -+++ s390-tools-2.15.1/dasdfmt/dasdfmt.c 2020-11-17 23:38:56.457778633 +0000 +--- a/dasdfmt/dasdfmt.c ++++ b/dasdfmt/dasdfmt.c @@ -25,6 +25,8 @@ #include "dasdfmt.h" @@ -189,14 +187,14 @@ geo.sectors * blksize; @@ -1242,7 +1243,7 @@ if (!g.ese || g.no_discard) - return; + return 0; - printf("Releasing space for the entire device...\n"); + printf("Releasing space for the entire %s device...\n", g.dev_path); err = dasd_release_space(g.dev_node, &r); - if (err) - error("Could not release space: %s", strerror(err)); -@@ -1261,20 +1262,21 @@ + /* + * Warn or Error on failing RAS depending on QUICK mode set explicitly or automatically +@@ -1270,20 +1271,21 @@ int err; if (!(g.withoutprompt && g.verbosity < 1)) @@ -223,7 +221,7 @@ /* except track 0 from standard formatting procss */ p->start_unit = 1; -@@ -1282,19 +1284,19 @@ +@@ -1291,19 +1293,19 @@ process_tracks(cylinders, heads, p); if (g.verbosity > 0) @@ -246,7 +244,7 @@ disk_enable(); } -@@ -1306,18 +1308,18 @@ +@@ -1315,18 +1317,18 @@ format_data_t *p) { if (!(g.withoutprompt && g.verbosity < 1)) @@ -269,7 +267,7 @@ if (g.verbosity > 0) printf("Re-accessing the device...\n"); -@@ -1426,16 +1428,16 @@ +@@ -1435,16 +1437,16 @@ if (!g.withoutprompt) { printf("\n"); if (mode != EXPAND) @@ -290,7 +288,7 @@ return; } } -@@ -1453,12 +1455,12 @@ +@@ -1466,12 +1468,12 @@ break; } @@ -305,7 +303,7 @@ err = dasd_reread_partition_table(g.dev_node, 5); if (err != 0) { ERRMSG("%s: error during rereading the partition " -@@ -1472,7 +1473,7 @@ +@@ -1485,7 +1487,7 @@ static void eval_format_mode(void) { if (!g.force && g.mode_specified && g.ese && mode == EXPAND) { @@ -314,15 +312,17 @@ warnx("Format mode 'expand' is not feasible."); error("Use --mode=full or --mode=quick to perform a clean format"); } -@@ -1495,20 +1496,70 @@ +@@ -1508,20 +1510,70 @@ prog_name = p + 1; } +-int main(int argc, char *argv[]) +void process_dasd(volume_label_t *orig_vlabel, format_data_t format_params) -+{ -+ volume_label_t vlabel; -+ char old_volser[7]; -+ char str[ERR_LENGTH]; + { + volume_label_t vlabel; + char old_volser[7]; +- + char str[ERR_LENGTH]; + unsigned int cylinders, heads; int rc; + + rc = dasd_get_info(g.dev_node, &g.dasd_info); @@ -371,12 +371,10 @@ + +} + - int main(int argc, char *argv[]) - { - volume_label_t vlabel; -- char old_volser[7]; - -- char str[ERR_LENGTH]; ++int main(int argc, char *argv[]) ++{ ++ volume_label_t vlabel; ++ char buf[7]; char *blksize_param_str = NULL; @@ -389,7 +387,7 @@ /* Establish a handler for interrupt signals. */ signal(SIGTERM, program_interrupt_signal); -@@ -1644,6 +1695,9 @@ +@@ -1657,6 +1709,9 @@ break; /* exit loop if finished */ } @@ -399,7 +397,7 @@ CHECK_SPEC_MAX_ONCE(g.blksize_specified, "blocksize"); CHECK_SPEC_MAX_ONCE(g.labelspec, "label"); CHECK_SPEC_MAX_ONCE(g.writenolabel, "omit-label-writing flag"); -@@ -1662,49 +1716,29 @@ +@@ -1675,48 +1730,28 @@ if (g.print_hashmarks) PARSE_PARAM_INTO(g.hashstep, hashstep_str, 10, "hashstep"); @@ -411,7 +409,11 @@ - - g.ese = dasd_sys_ese(g.dev_node); - eval_format_mode(); -- ++ while (optind < argc) { ++ get_device_name(optind, argc, argv); ++ strncpy(g.dev_path_array[numdev], g.dev_path, strlen(g.dev_path)); ++ strncpy(g.dev_node_array[numdev], g.dev_node, strlen(g.dev_node)); + - /* Either let the user specify the blksize or get it from the kernel */ - if (!g.blksize_specified) { - if (!(mode == FULL || @@ -419,8 +421,10 @@ - get_blocksize(&format_params.blksize); - else - format_params = ask_user_for_blksize(format_params); -- } -- ++ optind++; ++ numdev++; + } + - if (g.keep_volser) { - if (g.labelspec) - error("The -k and -l options are mutually exclusive"); @@ -432,9 +436,14 @@ - else - error("VOLSER not found on device %s", g.dev_path); - } -- ++ if (!numdev) ++ error("%s: No device specified!\n", ++ prog_name); + - check_disk(); -- ++ if (numdev > 1 && g.labelspec) ++ error("Specifying a volser to be written doesn't make sense when formatting multiple DASD volumes."); + - if (check_param(str, ERR_LENGTH, &format_params) < 0) - error("%s", str); - @@ -445,30 +454,13 @@ - check_disk_format(cylinders, heads, &format_params); - else - do_format_dasd(&vlabel, &format_params, cylinders, heads); -+ while (optind < argc) { -+ get_device_name(optind, argc, argv); -+ strncpy(g.dev_path_array[numdev], g.dev_path, strlen(g.dev_path)); -+ strncpy(g.dev_node_array[numdev], g.dev_node, strlen(g.dev_node)); -+ -+ optind++; -+ numdev++; -+ } -+ -+ if (!numdev) -+ error("%s: No device specified!\n", -+ prog_name); -+ -+ if (numdev > 1 && g.labelspec) -+ error("Specifying a volser to be written doesn't make sense when formatting multiple DASD volumes."); -+ + for (i = 0; i < numdev; i++) + { + strncpy(g.dev_path, g.dev_path_array[i], strlen(g.dev_path_array[i])+1); + strncpy(g.dev_node, g.dev_node_array[i], strlen(g.dev_node_array[i])+1); + process_dasd(&vlabel, format_params); + } - + free(g.dev_path); free(g.dev_node); - ++++++ s390-tools-sles15sp3-Format-devices-in-parallel.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.719712050 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.723712074 +0200 @@ -7,13 +7,10 @@ Signed-off-by: Hannes Reinecke <h...@suse.com> --- - dasdfmt/dasdfmt.8 | 16 ++++++++++++++-- - dasdfmt/dasdfmt.c | 50 +++++++++++++++++++++++++++++++++++++++++++------- - dasdfmt/dasdfmt.h | 1 + - 3 files changed, 58 insertions(+), 9 deletions(-) + dasdfmt/dasdfmt.8 | 16 +++++++++++++- + dasdfmt/dasdfmt.c | 58 ++++++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 60 insertions(+), 14 deletions(-) -diff --git a/dasdfmt/dasdfmt.8 b/dasdfmt/dasdfmt.8 -index e7fc501..07c674b 100644 --- a/dasdfmt/dasdfmt.8 +++ b/dasdfmt/dasdfmt.8 @@ -7,7 +7,7 @@ @@ -25,7 +22,7 @@ .br [-r \fIcylinder\fR] [-b \fIblksize\fR] [-l \fIvolser\fR] [-d \fIlayout\fR] .br -@@ -96,7 +96,7 @@ Do not use this option if you are using a 3270 console, +@@ -96,7 +96,7 @@ running in background or redirecting the output to a file. .TP @@ -34,7 +31,7 @@ Print one line for each formatted cylinder showing the number of the cylinder and percentage of formatting process. Intended to be used by higher level interfaces. -@@ -159,6 +159,18 @@ Specify blocksize to be used. \fIblksize\fR must be a positive integer +@@ -164,6 +164,18 @@ and always be a power of two. The recommended blocksize is 4096 bytes. .TP @@ -53,8 +50,8 @@ \fB-l\fR \fIvolser\fR or \fB--label\fR=\fIvolser\fR Specify the volume serial number or volume identifier to be written to disk after formatting. If no label is specified, a sensible default ---- s390-tools-2.15.1/dasdfmt/dasdfmt.c 2020-12-04 23:22:51.418265761 +0100 -+++ s390-tools-2.15.1/dasdfmt/dasdfmt.c 2020-12-04 23:29:26.165601000 +0100 +--- a/dasdfmt/dasdfmt.c ++++ b/dasdfmt/dasdfmt.c @@ -13,6 +13,7 @@ #include <sys/sysmacros.h> #include <sys/time.h> @@ -63,7 +60,7 @@ #include "lib/dasd_base.h" #include "lib/dasd_sys.h" -@@ -81,6 +82,7 @@ static struct dasdfmt_globals { +@@ -81,6 +82,7 @@ int mode_specified; int ese; int no_discard; @@ -71,7 +68,7 @@ } g = { .dasd_info = { 0 }, }; -@@ -105,6 +107,11 @@ static struct util_opt opt_vec[] = { +@@ -105,6 +107,11 @@ .desc = "Perform complete format check on device", .flags = UTIL_OPT_FLAG_NOSHORT, }, @@ -83,7 +80,7 @@ UTIL_OPT_SECTION("FORMAT OPTIONS"), { .option = { "blocksize", required_argument, NULL, 'b' }, -@@ -162,7 +169,7 @@ static struct util_opt opt_vec[] = { +@@ -162,7 +169,7 @@ .desc = "Show a progressbar", }, { @@ -92,7 +89,7 @@ .desc = "Show progress in percent", }, UTIL_OPT_SECTION("MISC"), -@@ -311,7 +318,7 @@ static void draw_progress(int cyl, unsig +@@ -311,7 +318,7 @@ } if (g.print_hashmarks && (cyl / g.hashstep - hashcount) != 0) { @@ -101,7 +98,7 @@ fflush(stdout); hashcount++; } -@@ -1560,7 +1567,11 @@ int main(int argc, char *argv[]) +@@ -1573,7 +1580,11 @@ char *reqsize_param_str = NULL; char *hashstep_str = NULL; @@ -114,7 +111,7 @@ /* Establish a handler for interrupt signals. */ signal(SIGTERM, program_interrupt_signal); -@@ -1623,7 +1634,7 @@ int main(int argc, char *argv[]) +@@ -1636,7 +1647,7 @@ g.print_hashmarks = 1; } break; @@ -123,7 +120,7 @@ if (!(g.print_hashmarks || g.print_progressbar)) g.print_percentage = 1; break; -@@ -1682,6 +1693,9 @@ int main(int argc, char *argv[]) +@@ -1695,6 +1706,9 @@ case OPT_NODISCARD: g.no_discard = 1; break; @@ -133,7 +130,7 @@ case OPT_CHECK: g.check = 1; break; -@@ -1733,15 +1747,35 @@ int main(int argc, char *argv[]) +@@ -1746,15 +1760,35 @@ if (numdev > 1 && g.labelspec) error("Specifying a volser to be written doesn't make sense when formatting multiple DASD volumes."); ++++++ s390-tools-sles15sp3-Implement-Y-yast_mode.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.747712222 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.771712369 +0200 @@ -7,13 +7,10 @@ Signed-off-by: Hannes Reinecke <h...@suse.com> --- - dasdfmt/dasdfmt.8 | 7 ++++++- - dasdfmt/dasdfmt.c | 27 ++++++++++++++++++++------- - dasdfmt/dasdfmt.h | 1 + - 3 files changed, 27 insertions(+), 8 deletions(-) + dasdfmt/dasdfmt.8 | 7 ++++- + dasdfmt/dasdfmt.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 72 insertions(+), 8 deletions(-) -diff --git a/dasdfmt/dasdfmt.8 b/dasdfmt/dasdfmt.8 -index 07c674b..3fd10a2 100644 --- a/dasdfmt/dasdfmt.8 +++ b/dasdfmt/dasdfmt.8 @@ -7,7 +7,7 @@ @@ -25,7 +22,7 @@ .br [-r \fIcylinder\fR] [-b \fIblksize\fR] [-l \fIvolser\fR] [-d \fIlayout\fR] .br -@@ -113,6 +113,11 @@ The value will be at least as big as the -r or --requestsize value. +@@ -113,6 +113,11 @@ .br .TP @@ -37,11 +34,9 @@ \fB-M\fR \fImode\fR or \fB--mode\fR=\fImode\fR Specify the \fImode\fR to be used to format the device. Valid modes are: .RS -diff --git a/dasdfmt/dasdfmt.c b/dasdfmt/dasdfmt.c -index 6dd28fa..5b6023a 100644 --- a/dasdfmt/dasdfmt.c +++ b/dasdfmt/dasdfmt.c -@@ -83,6 +83,7 @@ static struct dasdfmt_globals { +@@ -83,6 +83,7 @@ int ese; int no_discard; int procnum; @@ -49,7 +44,7 @@ } g = { .dasd_info = { 0 }, }; -@@ -172,6 +173,10 @@ static struct util_opt opt_vec[] = { +@@ -172,6 +173,10 @@ .option = { "percentage", no_argument, NULL, 'Q' }, .desc = "Show progress in percent", }, @@ -60,7 +55,7 @@ UTIL_OPT_SECTION("MISC"), { .option = { "check_host_count", no_argument, NULL, 'C' }, -@@ -318,7 +323,9 @@ static void draw_progress(int cyl, unsig +@@ -318,7 +323,9 @@ } if (g.print_hashmarks && (cyl / g.hashstep - hashcount) != 0) { @@ -71,7 +66,7 @@ fflush(stdout); hashcount++; } -@@ -392,7 +399,7 @@ static void evaluate_format_error(format +@@ -392,7 +399,7 @@ unsigned int kl = 0; int blksize = cdata->expect.blksize; @@ -80,10 +75,10 @@ printf("\n"); /* -@@ -780,8 +787,9 @@ static void check_hashmarks(void) +@@ -780,8 +787,9 @@ g.hashstep = 10; } - + - printf("Printing hashmark every %d cylinders.\n", - g.hashstep); + if (!g.yast_mode) @@ -92,7 +87,7 @@ } } -@@ -1462,17 +1470,19 @@ static void do_format_dasd(volume_label_ +@@ -1475,17 +1483,19 @@ break; } @@ -115,7 +110,7 @@ printf("ok\n"); } } -@@ -1548,6 +1558,7 @@ void process_dasd(volume_label_t *orig_v +@@ -1561,6 +1571,7 @@ error("%s", str); set_geo(&cylinders, &heads); @@ -123,7 +118,7 @@ set_label(&vlabel, &format_params, cylinders); if (g.check) -@@ -1557,6 +1568,29 @@ void process_dasd(volume_label_t *orig_v +@@ -1570,6 +1581,29 @@ } @@ -153,7 +148,7 @@ int main(int argc, char *argv[]) { volume_label_t vlabel; -@@ -1693,6 +1727,10 @@ int main(int argc, char *argv[]) +@@ -1706,6 +1740,10 @@ case OPT_NODISCARD: g.no_discard = 1; break; @@ -164,7 +159,7 @@ case 'P': max_parallel = atoi(optarg); break; -@@ -1728,6 +1766,21 @@ int main(int argc, char *argv[]) +@@ -1741,6 +1779,21 @@ reqsize = DEFAULT_REQUESTSIZE; } @@ -186,7 +181,7 @@ if (g.print_hashmarks) PARSE_PARAM_INTO(g.hashstep, hashstep_str, 10, "hashstep"); -@@ -1747,6 +1800,12 @@ int main(int argc, char *argv[]) +@@ -1760,6 +1813,12 @@ if (numdev > 1 && g.labelspec) error("Specifying a volser to be written doesn't make sense when formatting multiple DASD volumes."); @@ -199,7 +194,4 @@ for (numproc = 0; numproc < numdev; numproc++) { chpid = fork(); if (chpid == -1 ) --- -1.7.12.4 - ++++++ s390-tools-sles15sp3-Implement-f-for-backwards-compability.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.791712493 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.795712517 +0200 @@ -9,15 +9,13 @@ Signed-off-by: Hannes Reinecke <h...@suse.com> --- - dasdfmt/dasdfmt.8 | 6 +++++- - dasdfmt/dasdfmt.c | 8 ++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) + dasdfmt/dasdfmt.8 | 6 +++++- + dasdfmt/dasdfmt.c | 10 ++++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) -diff --git a/dasdfmt/dasdfmt.8 b/dasdfmt/dasdfmt.8 -index 3fd10a2..7fdb4bd 100644 --- a/dasdfmt/dasdfmt.8 +++ b/dasdfmt/dasdfmt.8 -@@ -11,7 +11,7 @@ dasdfmt \- formatting of DASD (ECKD) disk drives. +@@ -11,7 +11,7 @@ .br [-r \fIcylinder\fR] [-b \fIblksize\fR] [-l \fIvolser\fR] [-d \fIlayout\fR] .br @@ -26,7 +24,7 @@ .SH DESCRIPTION \fBdasdfmt\fR formats one or several DASD (ECKD) disk drive to prepare it -@@ -42,6 +42,10 @@ out, what it \fBwould\fR do. +@@ -42,6 +42,10 @@ Increases verbosity. .TP @@ -37,8 +35,6 @@ \fB-y\fR Start formatting without further user-confirmation. -diff --git a/dasdfmt/dasdfmt.c b/dasdfmt/dasdfmt.c -index 5b6023a..cdd80df 100644 --- a/dasdfmt/dasdfmt.c +++ b/dasdfmt/dasdfmt.c @@ -113,6 +113,10 @@ @@ -52,7 +48,7 @@ UTIL_OPT_SECTION("FORMAT OPTIONS"), { .option = { "blocksize", required_argument, NULL, 'b' }, -@@ -1649,6 +1653,12 @@ +@@ -1662,6 +1666,12 @@ } g.layout_specified = 1; break; @@ -65,6 +61,4 @@ case 'y': g.withoutprompt = 1; break; --- -1.7.12.4 ++++++ s390-tools-sles15sp3-dasdfmt-retry-BIODASDINFO-if-device-is-busy.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.807712591 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.811712616 +0200 @@ -16,11 +16,9 @@ Signed-off-by: Hannes Reinecke <h...@suse.de> --- - dasdfmt/dasdfmt.c | 21 ++++++++++++++++++--- - 1 file changed, 18 insertions(+), 3 deletions(-) + dasdfmt/dasdfmt.c | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) -diff --git a/dasdfmt/dasdfmt.c b/dasdfmt/dasdfmt.c -index e1877ac..f03cbad 100644 --- a/dasdfmt/dasdfmt.c +++ b/dasdfmt/dasdfmt.c @@ -621,7 +621,7 @@ @@ -56,7 +54,4 @@ if (g.dasd_info.open_count > 1) error("Disk %s is in use!", g.dev_path); } --- -1.8.4.5 - ++++++ s390-tools-sles15sp5-remove-no-pie-link-arguments.patch ++++++ --- /var/tmp/diff_new_pack.TMT5nj/_old 2023-06-14 16:32:42.819712665 +0200 +++ /var/tmp/diff_new_pack.TMT5nj/_new 2023-06-14 16:32:42.823712689 +0200 @@ -1,6 +1,10 @@ ---- s390-tools-2.24.0/common.mak 2022-11-09 11:11:48.000000000 -0500 -+++ s390-tools-2.24.0/common.mak 2022-11-28 09:46:19.055653319 -0500 -@@ -254,8 +254,8 @@ +--- + common.mak | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/common.mak ++++ b/common.mak +@@ -328,8 +328,8 @@ LDFLAGS CPPFLAGS ALL_CFLAGS ALL_CXXFLAGS ALL_LDFLAGS ALL_CPPFLAGS ifneq ($(shell $(CC_SILENT) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
