From b7a7ab194398ab3519004376d35d834385e2d916 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@hoyer.xyz>

Date: Fri, 12 Jan 2018 10:36:56 +0100

Subject: [PATCH] Merge pull request #354 from yuwata/spec-s390x

spec: do not package s390 specific modules

---

 dracut.spec | 41 ++++++++++++++++++++++++++++++-----------

 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/dracut.spec b/dracut.spec

index 08e5a098..11c7459a 100644

--- a/dracut.spec

+++ b/dracut.spec

@@ -284,6 +284,19 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey

 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity

 %endif

+%infarch s390 s390x

+# remove architecture specific modules

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/80cms

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/91zipl

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_mod

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_rules

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dcssblk

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp_rules

+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95znet

+%endif

+

 mkdir -p $RPM_BUILD_ROOT/boot/dracut

 mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay

 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log

@@ -385,7 +398,6 @@ rm -rf -- $RPM_BUILD_ROOT

 %{dracutlibdir}/modules.d/45url-lib

 %{dracutlibdir}/modules.d/50drm

 %{dracutlibdir}/modules.d/50plymouth

-%{dracutlibdir}/modules.d/80cms

 %{dracutlibdir}/modules.d/80lvmmerge

 %{dracutlibdir}/modules.d/90btrfs

 %{dracutlibdir}/modules.d/90crypt

@@ -400,29 +412,34 @@ rm -rf -- $RPM_BUILD_ROOT

 %{dracutlibdir}/modules.d/91crypt-gpg

 %{dracutlibdir}/modules.d/91crypt-loop

 %{dracutlibdir}/modules.d/95debug

+%{dracutlibdir}/modules.d/95fstab-sys

+%{dracutlibdir}/modules.d/95lunmask

 %{dracutlibdir}/modules.d/95resume

 %{dracutlibdir}/modules.d/95rootfs-block

+%{dracutlibdir}/modules.d/95terminfo

+%{dracutlibdir}/modules.d/95udev-rules

+%{dracutlibdir}/modules.d/95virtfs

+%ifarch s390 s390x

+%{dracutlibdir}/modules.d/80cms

+%{dracutlibdir}/modules.d/91zipl

 %{dracutlibdir}/modules.d/95dasd

 %{dracutlibdir}/modules.d/95dasd_mod

 %{dracutlibdir}/modules.d/95dasd_rules

-%{dracutlibdir}/modules.d/95fstab-sys

-%{dracutlibdir}/modules.d/95lunmask

+%{dracutlibdir}/modules.d/95dcssblk

 %{dracutlibdir}/modules.d/95zfcp

 %{dracutlibdir}/modules.d/95zfcp_rules

-%{dracutlibdir}/modules.d/95terminfo

-%{dracutlibdir}/modules.d/95udev-rules

-%{dracutlibdir}/modules.d/95virtfs

+%endif

 %if %{undefined _unitdir}

 %{dracutlibdir}/modules.d/96securityfs

 %{dracutlibdir}/modules.d/97masterkey

 %{dracutlibdir}/modules.d/98integrity

 %endif

 %{dracutlibdir}/modules.d/97biosdevname

+%{dracutlibdir}/modules.d/98dracut-systemd

 %{dracutlibdir}/modules.d/98ecryptfs

 %{dracutlibdir}/modules.d/98pollcdrom

 %{dracutlibdir}/modules.d/98selinux

 %{dracutlibdir}/modules.d/98syslog

-%{dracutlibdir}/modules.d/98dracut-systemd

 %{dracutlibdir}/modules.d/98usrmount

 %{dracutlibdir}/modules.d/99base

 %{dracutlibdir}/modules.d/99fs-lib

@@ -456,17 +473,19 @@ rm -rf -- $RPM_BUILD_ROOT

 %defattr(-,root,root,0755)

 %{dracutlibdir}/modules.d/02systemd-networkd

 %{dracutlibdir}/modules.d/40network

+%{dracutlibdir}/modules.d/45ifcfg

 %{dracutlibdir}/modules.d/90kernel-network-modules

-%{dracutlibdir}/modules.d/95fcoe

-%{dracutlibdir}/modules.d/95iscsi

 %{dracutlibdir}/modules.d/90qemu-net

 %{dracutlibdir}/modules.d/95cifs

+%{dracutlibdir}/modules.d/95fcoe

+%{dracutlibdir}/modules.d/95fcoe-uefi

+%{dracutlibdir}/modules.d/95iscsi

 %{dracutlibdir}/modules.d/95nbd

 %{dracutlibdir}/modules.d/95nfs

 %{dracutlibdir}/modules.d/95ssh-client

-%{dracutlibdir}/modules.d/45ifcfg

+%ifarch s390 s390x

 %{dracutlibdir}/modules.d/95znet

-%{dracutlibdir}/modules.d/95fcoe-uefi

+%endif

 %{dracutlibdir}/modules.d/99uefi-lib

 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}