Accepting request 546824 from home:markkp:branches:Base:System

- Added the following patches (bsc#1068538)
  * s390-tools-sles15-cpi-add-unit-install-section.patch
  * s390-tools-sles15-zipl-remove-invalid-dasdview-command-line-option.patch
  * s390-tools-sles15-ziomon-re-add-missing-line.patch
- Modified s390-tools-sles15-zdev-Use-correct-path-to-vmcp-binary.patch to
  point to the correct line in the common.mk file.

OBS-URL: https://build.opensuse.org/request/show/546824
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=38

s390-tools-sles15-cpi-add-unit-install-section.patch

@@ -0,0 +1,27 @@
+Subject: [PATCH] [BZ 160944] cpi: add missing Install section to service unit
+From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
+
+Description:  cpi: add missing Install section to service unit
+Symptom:      Enabling the cpi service unit fails because it
+              does not include information about where to install
+              it.
+Problem:      An install section is missing.
+Solution:     Add an install section.
+Reproduction: Issue systemctl enable cpi.
+Upstream-ID:  -
+Problem-ID:   160944
+
+Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
+---
+ systemd/cpi.service.in |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/systemd/cpi.service.in
++++ b/systemd/cpi.service.in
+@@ -38,3 +38,6 @@ EnvironmentFile=/etc/sysconfig/cpi
+ #
+ # Sending data to the HMC/SE
+ ExecStart=@toolslib_path@/cpictl -e
++
++[Install]
++WantedBy=multi-user.target

s390-tools-sles15-zdev-Use-correct-path-to-vmcp-binary.patch

@@ -22,7 +22,7 @@ diff --git a/common.mak b/common.mak
 index b9a9f54..bb6cdf0 100644
 --- a/common.mak
 +++ b/common.mak
-@@ -194,12 +194,14 @@ ALL_CFLAGS	= -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
+@@ -193,12 +193,14 @@ ALL_CFLAGS	= -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
  			-DS390_TOOLS_LIBDIR=$(TOOLS_LIBDIR) \
  			-DS390_TOOLS_DATADIR=$(TOOLS_DATADIR) \
  			-DS390_TOOLS_SYSCONFDIR=$(SYSCONFDIR) \

s390-tools-sles15-ziomon-re-add-missing-line.patch

@@ -0,0 +1,28 @@
+Subject: [PATCH] [BZ 161467] ziomon: Re-add missing line in ziomon_fcpconf
+From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
+
+Description:  ziomon: Re-add missing line in ziomon_fcpconf
+Symptom:      ziomon_fcpconf fails on startup with:
+              Global symbol "$map_dev" requires explicit package name ...
+Problem:      During the GPL to MIT conversion process from v1.39.0 to
+              v2.0.0 one line has been lost by accident.
+Solution:     Re-add that line again.
+Reproduction: Call the ziomon_fcpconf tool.
+Upstream-ID:  523d833eb31633673847b6da0edbd35903f14dc4
+Problem-ID:   161467
+
+Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
+---
+ ziomon/ziomon_fcpconf |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/ziomon/ziomon_fcpconf
++++ b/ziomon/ziomon_fcpconf
+@@ -58,6 +58,7 @@ sub store_mapper_devices
+ 	my $src_dir = shift();
+ 	my @entries = grep { ! /^\./ } dir_content($src_dir);
+ 
++	foreach my $map_dev (@entries) {
+ 		my $tf = catfile($src_dir, "$map_dev");
+ 		my $mm = `stat -L -c%t:%T $tf`;
+ 		chomp($mm);

s390-tools-sles15-zipl-remove-invalid-dasdview-command-line-option.patch

@@ -0,0 +1,29 @@
+Subject: [PATCH] [BZ 161183] zipl: remove invalid dasdview command line option
+From: Stefan Haberland <sth@linux.vnet.ibm.com>
+
+Description:  zipl: remove invalid dasdview command line option
+Symptom:      zipl does not work when used with a lvm or device mapper
+              target.
+Problem:      The zipl_helper.device-mapper script uses dasdview with
+              an option "-f" that has been removed recently.
+Solution:     Remove "-f" from the dasdview call.
+Reproduction: Run zipl on a lvm target.
+Upstream-ID:  -
+Problem-ID:   161183
+
+Signed-off-by: Stefan Haberland <sth@linux.vnet.ibm.com>
+---
+ zipl/src/zipl_helper.device-mapper |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/zipl/src/zipl_helper.device-mapper
++++ b/zipl/src/zipl_helper.device-mapper
+@@ -623,7 +623,7 @@ sub get_dasd_info($)
+ 	my $type;
+ 	local *HANDLE;
+ 
+-	open(HANDLE, "$dasdview -x -f  $dev 2>/dev/null|") or
++	open(HANDLE, "$dasdview -x $dev 2>/dev/null|") or
+ 		# dasdview returned with an error
+ 		return undef;
+ 	while (<HANDLE>) {

s390-tools.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Nov 30 20:22:09 UTC 2017 - mpost@suse.com
+
+- Added the following patches (bsc#1068538)
+  * s390-tools-sles15-cpi-add-unit-install-section.patch
+  * s390-tools-sles15-zipl-remove-invalid-dasdview-command-line-option.patch
+  * s390-tools-sles15-ziomon-re-add-missing-line.patch
+- Modified s390-tools-sles15-zdev-Use-correct-path-to-vmcp-binary.patch to
+  point to the correct line in the common.mk file.
+
 -------------------------------------------------------------------
 Thu Nov 23 13:41:27 UTC 2017 - rbrown@suse.com
 

s390-tools.spec

@@ -122,6 +122,9 @@ Patch14:        s390-tools-sles12-fdasd-skip-partition-check-and-BLKRRPART-ioctl
 Patch15:        s390-tools-sles15-Fix-truncation-warning.patch
 Patch16:        s390-tools-sles15-iucvterm-include-ctype-for-toupper.patch
 Patch17:        s390-tools-sles15-zdev-Use-correct-path-to-vmcp-binary.patch
+Patch18:        s390-tools-sles15-cpi-add-unit-install-section.patch
+Patch19:        s390-tools-sles15-zipl-remove-invalid-dasdview-command-line-option.patch
+Patch20:        s390-tools-sles15-ziomon-re-add-missing-line.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  s390 s390x
@@ -195,6 +198,9 @@ to list files and directories.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 cp -vi %{S:22} CAUTION