From e9f0a67862b1f51998f00f5d08edd420e20f11db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 10 Aug 2018 16:31:48 +0200
Subject: [PATCH] - rebased to 2.6.0 - include zdev dracut module

---
 .gitignore     |  1 +
 s390utils.spec | 16 +++++++++++++---
 sources        |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4cbdf56..b671e06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ src_vipa-2.0.4.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
diff --git a/s390utils.spec b/s390utils.spec
index 9ec4f4a..e948b47 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -4,8 +4,8 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
 Group:          System Environment/Base
-Version:        2.5.0
-Release:        5%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -108,6 +108,7 @@ popd
 
 %install
 make install \
+        HAVE_DRACUT=1 \
         DESTDIR=$RPM_BUILD_ROOT \
         BINDIR=/usr/sbin \
         SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
@@ -204,6 +205,8 @@ Requires:       network-scripts
 BuildRequires:  ncurses-devel
 BuildRequires:  libpfm-devel
 BuildRequires:  glibc-static
+BuildRequires:  cryptsetup-devel >= 2.0.3
+BuildRequires:  json-c-devel
 
 
 %description base
@@ -401,12 +404,14 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_bindir}/dump2tar
 %{_bindir}/vmconvert
 %{_bindir}/zkey
+%{_bindir}/zkey-cryptsetup
 %{_unitdir}/cpi.service
 %{_unitdir}/dumpconf.service
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/cpi
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
-/lib/s390-tools
+/lib/s390-tools/
+/usr/lib/dracut/modules.d/95zdev/
 %{_mandir}/man1/dbginfo.sh.1*
 %{_mandir}/man1/dump2tar.1*
 %{_mandir}/man1/lscpumf.1*
@@ -414,6 +419,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man1/zfcpdbf.1*
 %{_mandir}/man1/zipl-switch-to-blscfg.1*
 %{_mandir}/man1/zkey.1*
+%{_mandir}/man1/zkey-cryptsetup.1*
 %{_mandir}/man4/prandom.4*
 %{_mandir}/man5/zipl.conf.5*
 %{_mandir}/man8/chccwdev.8*
@@ -807,6 +813,10 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Fri Aug 10 2018 Dan Horák <dan[at]danny.cz> - 2:2.6.0-1
+- rebased to 2.6.0
+- include zdev dracut module
+
 * Tue Jul 31 2018 Dan Horák <dan[at]danny.cz> - 2:2.5.0-5
 - add missing zkey infrastructure (#1610242)
 
diff --git a/sources b/sources
index ee1ceae..1db11a3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0
 SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7
-SHA512 (s390-tools-2.5.0.tar.gz) = 6f4c27ba4cf49aa46b165b0b2c218d72cf3ff5b99cc498af5d7774f0077f333d333c5eda2c031f04982e2d441f1f48f8979da639d4a80f98468b91ceb276a38d
+SHA512 (s390-tools-2.6.0.tar.gz) = 0f35eae85896c4fbc784d0e0549c7856741e7d8ba979f2897c6f546987485d19019dac36b9443d2ff10f8da3128de2203c7526fac480756388fc61380a93536e