Accepting request 947319 from Base:System

OBS-URL: https://build.opensuse.org/request/show/947319
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/s390-tools?expand=0&rev=42

s390-tools-sles15sp4-chreipl-fcp-mpath-don-t-compress-the-manpage-before-.patch

@@ -0,0 +1,116 @@
+From 1bbd34e500980b9ea2514776bb2dbd745247e651 Mon Sep 17 00:00:00 2001
+From: Benjamin Block <bblock@linux.ibm.com>
+Date: Fri, 12 Nov 2021 13:34:22 +0100
+Subject: [PATCH] chreipl-fcp-mpath: don't compress the manpage before
+ installing it
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Remove the call to `gzip` before installing the manpage during the
+`make install` call. What and if compression is done should be handled by
+the distribution tooling.
+
+This also removes a dependency for the build process.
+
+Reviewed-by: Steffen Maier <maier@linux.ibm.com>
+Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
+Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
+---
+ CHANGELOG.md                 |  1 +
+ README.md                    |  2 +-
+ chreipl-fcp-mpath/.gitignore |  1 -
+ chreipl-fcp-mpath/Makefile   | 11 +----------
+ chreipl-fcp-mpath/README.md  |  5 ++---
+ 5 files changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index 94817e1..8cac1cb 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -12,6 +12,7 @@
+   - dbginfo.sh: Add retry timeout and remove possible blocking "blockdev --report"
+   - dbginfo.sh: Collect config- and debug-data for chreipl-fcp-mpath
+   - hsci: Add support for multiple MAC addresses
++  - chreipl-fcp-mpath: don't compress the manpage before installing it
+ 
+   Bug Fixes:
+   - lshwc: Fix compile error for gcc <8.1
+diff --git a/README.md b/README.md
+index eb5c81f..62e4c11 100644
+--- a/README.md
++++ b/README.md
+@@ -479,4 +479,4 @@ the different tools are provided:
+   util-linux, udev, and multipath-tools. When using `HAVE_DRACUT=1` with the
+   make invocation, it also requires dracut. When using `ENABLE_DOC=1` with the
+   make invocation to build a man page and render the README.md as HTML, make
+-  further requires pandoc, GNU awk, and GNU Gzip for the build process.
++  further requires pandoc and GNU awk for the build process.
+diff --git a/chreipl-fcp-mpath/.gitignore b/chreipl-fcp-mpath/.gitignore
+index 4611195..ecd49ee 100644
+--- a/chreipl-fcp-mpath/.gitignore
++++ b/chreipl-fcp-mpath/.gitignore
+@@ -10,4 +10,3 @@
+ /README.pdf
+ /chreipl-fcp-mpath.md
+ /chreipl-fcp-mpath.7
+-/chreipl-fcp-mpath.7.gz
+diff --git a/chreipl-fcp-mpath/Makefile b/chreipl-fcp-mpath/Makefile
+index 80cab7f..9b4aae0 100644
+--- a/chreipl-fcp-mpath/Makefile
++++ b/chreipl-fcp-mpath/Makefile
+@@ -12,8 +12,6 @@
+ #   bash:
+ #     - bash
+ # If $(ENABLE_DOC) is `1`:
+-#   GNU Gzip:
+-#     - gzip
+ #   GNU awk:
+ #     - gawk
+ 
+@@ -186,18 +184,11 @@ INSTDIRS += $(MANDIR)
+ .PHONY: chreipl-fcp-mpath-install-man-page
+ chreipl-fcp-mpath-install-man-page: | $(DESTDIR)$(MANDIR)/man7
+ chreipl-fcp-mpath-install-man-page: chreipl-fcp-mpath.7
+-	$(GZIP) -fk --best chreipl-fcp-mpath.7
+ 	$(INSTALL_DATA) -t $(DESTDIR)$(MANDIR)/man7			\
+-		chreipl-fcp-mpath.7.gz
++		chreipl-fcp-mpath.7
+ 
+ chreipl-fcp-mpath-install: chreipl-fcp-mpath-install-man-page
+ 
+-.PHONY: chreipl-fcp-mpath-install-man-page-clean
+-chreipl-fcp-mpath-install-man-page-clean:
+-	rm -f chreipl-fcp-mpath.7.gz
+-
+-chreipl-fcp-mpath-clean: chreipl-fcp-mpath-install-man-page-clean
+-
+ endif
+ 
+ #
+diff --git a/chreipl-fcp-mpath/README.md b/chreipl-fcp-mpath/README.md
+index 3943f73..d58ccd2 100644
+--- a/chreipl-fcp-mpath/README.md
++++ b/chreipl-fcp-mpath/README.md
+@@ -131,8 +131,7 @@ To build and install the documentation (man page) you need:
+ 
+   - pandoc;
+   - GNU Core Utilities (date);
+-  - GNU awk;
+-  - GNU Gzip.
++  - GNU awk.
+ 
+ INSTALLATION
+ ============
+@@ -207,7 +206,7 @@ files to these default locations:
+     /usr/lib/udev/chreipl-fcp-mpath-record-volume-identifier
+     /usr/lib/udev/chreipl-fcp-mpath-try-change-ipl-path
+     /usr/lib/udev/rules.d/70-chreipl-fcp-mpath.rules
+-    /usr/share/man/man7/chreipl-fcp-mpath.7.gz
++    /usr/share/man/man7/chreipl-fcp-mpath.7
+ 
+ UNINSTALL
+ =========
+-- 
+2.26.2
+

s390-tools-sles15sp4-chreipl-fcp-mpath-remove-shebang-from-chreipl-fcp-mp.patch

@@ -0,0 +1,36 @@
+From c2f8988444d0ed8274256c1990bb7f8866c265e2 Mon Sep 17 00:00:00 2001
+From: Benjamin Block <bblock@linux.ibm.com>
+Date: Fri, 12 Nov 2021 12:38:10 +0100
+Subject: [PATCH] chreipl-fcp-mpath: remove shebang from
+ chreipl-fcp-mpath-common.sh.in
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+`chreipl-fcp-mpath-common.sh.in` is never executed, only used as argument
+for `source` in the udev helper scripts, so the shebang is unnecessary, and
+might be confusing.
+
+Also, tools like `rpmlint` from the rpm software management will complain
+about this; e.g.:
+  s390-tools-chreipl-fcp-mpath.s390x: W: non-executable-script /usr/lib/chreipl-fcp-mpath/chreipl-fcp-mpath-common.sh 644 /bin/bash
+
+Reviewed-by: Steffen Maier <maier@linux.ibm.com>
+Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
+Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
+---
+ chreipl-fcp-mpath/chreipl-fcp-mpath-common.sh.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/chreipl-fcp-mpath/chreipl-fcp-mpath-common.sh.in b/chreipl-fcp-mpath/chreipl-fcp-mpath-common.sh.in
+index 83c4361..0a54322 100644
+--- a/chreipl-fcp-mpath/chreipl-fcp-mpath-common.sh.in
++++ b/chreipl-fcp-mpath/chreipl-fcp-mpath-common.sh.in
+@@ -1,4 +1,3 @@
+-#!/bin/bash
+ # SPDX-License-Identifier: MIT
+ #
+ # chreipl-fcp-mpath: use multipath information to change FCP IPL target
+-- 
+2.26.2
+

s390-tools.changes

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Mon Nov  8 20:08:54 UTC 2021 - Mark Post <mpost@suse.com>
+Wed Jan 12 21:27:13 UTC 2022 - Mark Post <mpost@suse.com>
 
 - Upgraded to version 2.19.0 (jsc#SLE-18324)
   * v2.19.0 (2021-11-10)__
@@ -85,6 +85,9 @@ Mon Nov  8 20:08:54 UTC 2021 - Mark Post <mpost@suse.com>
     - zipl/boot: Fix memory use after free in stage2
     - zipl/boot: Fix potential heap overflow in stage2
     - zipl: Fix reading 4k disk's geometry
+- Added the following two IBM patches:
+  * s390-tools-sles15sp4-chreipl-fcp-mpath-don-t-compress-the-manpage-before-.patch
+  * s390-tools-sles15sp4-chreipl-fcp-mpath-remove-shebang-from-chreipl-fcp-mp.patch
 - Removed the following obsolete patches
   * s390-tools-sles15sp3-dasdfmt-Fix-segfault-when-an-incorrect-option-is-spe.patch
   * s390-tools-sles15sp3-libutil-Compare-proc-entries-to-vfstype.patch
@@ -100,9 +103,19 @@ Mon Nov  8 20:08:54 UTC 2021 - Mark Post <mpost@suse.com>
   * s390-tools-sles15sp3-zipl-fix-4k-scsi-ipl.patch
   * s390-tools-sles15sp3-dasd-change-DASD-udev-rule-to-set-none-scheduler.patch
   * s390-tools-sles15sp3-check-return-code-from-util_file_read_l.patch
+  * s390-tools-sles15sp3-dbginfo.sh-exclude-page_idle-bitmap.patch
 - Removed an obsolete "export ROOT_BUILD_DIR" statement from the spec file.
 - Removed unnecessary defattr statements in the files section.
 
+-------------------------------------------------------------------
+Fri Nov 12 18:05:00 UTC 2021 - Mark Post <mpost@suse.com>
+
+- Added s390-tools-sles15sp3-dbginfo.sh-exclude-page_idle-bitmap.patch
+  Reading /sys/kernel/mm/page_idle/bitmap can cause hang up on
+  reading offline pages. (bsc#1192599)
+- Added %{version} to the Requires: libekmfweb1 for the
+  libekmfweb1-devel package.
+
 -------------------------------------------------------------------
 Mon Oct 18 17:51:04 UTC 2021 - Mark Post <mpost@suse.com>
 

s390-tools.spec

@@ -87,6 +87,10 @@ Source98:       zfcp_disk_configure.8
 Source99:       zfcp_host_configure.8
 ###
 
+# IBM patches
+Patch001:       s390-tools-sles15sp4-chreipl-fcp-mpath-don-t-compress-the-manpage-before-.patch
+Patch002:       s390-tools-sles15sp4-chreipl-fcp-mpath-remove-shebang-from-chreipl-fcp-mp.patch
+
 # SUSE patches
 Patch900:       s390-tools-sles12-zipl_boot_msg.patch
 Patch901:       s390-tools-sles15-sysconfig-compatible-dumpconf.patch