From 3a201734482ac0018aad11327a3169ab532a5f96a794fff3b52cc522ccc56e48 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Mon, 14 Jan 2019 18:51:09 +0000 Subject: [PATCH] Accepting request 666037 from home:markkp:branches:Base:System - Added the following two patches from IBM (bsc#1121719): * s390-tools-sles15sp1-01-zkey-Include-sbin-into-PATH-when-executing-commands.patch * s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CCA-library.patch - Added the following patch to correct a problem with CTC network interfaces not coming up after a reboot (bsc#1119102) * s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch OBS-URL: https://build.opensuse.org/request/show/666037 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=68 --- ...ev-Also-include-the-ctc-driver-in-the-initrd.patch | 11 +++++++++++ s390-tools.changes | 3 +++ s390-tools.spec | 6 ++++-- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch diff --git a/s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch b/s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch new file mode 100644 index 0000000..9b9977c --- /dev/null +++ b/s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch @@ -0,0 +1,11 @@ +--- a/zdev/dracut/95zdev/module-setup.sh 2019-01-10 11:39:08.000000000 -0500 ++++ b/zdev/dracut/95zdev/module-setup.sh 2019-01-14 13:28:33.983461097 -0500 +@@ -32,7 +32,7 @@ + installkernel() { + # Add modules for all device types supported by chzdev (required for + # auto-configuration) +- instmods lcs qeth qeth_l2 qeth_l3 dasd_mod dasd_eckd_mod dasd_fba_mod \ ++ instmods ctcm lcs qeth qeth_l2 qeth_l3 dasd_mod dasd_eckd_mod dasd_fba_mod \ + dasd_diag_mod zfcp + } + diff --git a/s390-tools.changes b/s390-tools.changes index 426c66a..1b84ebb 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -4,6 +4,9 @@ Mon Jan 14 17:03:37 UTC 2019 - mpost@suse.com - Added the following two patches from IBM (bsc#1121719): * s390-tools-sles15sp1-01-zkey-Include-sbin-into-PATH-when-executing-commands.patch * s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CCA-library.patch +- Added the following patch to correct a problem with CTC network + interfaces not coming up after a reboot (bsc#1119102) + * s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch ------------------------------------------------------------------- Wed Jan 9 23:17:22 UTC 2019 - mpost@suse.com diff --git a/s390-tools.spec b/s390-tools.spec index 09b12e2..1264c24 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,7 +27,7 @@ Release: 0 Summary: S/390 tools like zipl and dasdfmt License: MIT Group: System/Kernel -Url: https://github.com/ibm-s390-tools/s390-tools +URL: https://github.com/ibm-s390-tools/s390-tools Source: s390-tools-%{version}.tar.gz Source1: s390-tools-rpmlintrc Source2: zipl.conf @@ -186,6 +186,7 @@ Patch97: s390-tools-sles15sp1-zdev-fix-qeth-BridgePort-and-VNICC-conflict Patch98: s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch Patch99: s390-tools-sles15sp1-01-zkey-Include-sbin-into-PATH-when-executing-commands.patch Patch100: s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CCA-library.patch +Patch101: s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch BuildRequires: dracut BuildRequires: fuse-devel @@ -365,6 +366,7 @@ to list files and directories. %patch98 -p1 %patch99 -p1 %patch100 -p1 +%patch101 -p1 cp -vi %{SOURCE22} CAUTION