|
 |
d9da667 |
From b7a7ab194398ab3519004376d35d834385e2d916 Mon Sep 17 00:00:00 2001
|
|
|
d9da667 |
From: Harald Hoyer <harald@hoyer.xyz>
|
|
|
d9da667 |
Date: Fri, 12 Jan 2018 10:36:56 +0100
|
|
|
d9da667 |
Subject: [PATCH] Merge pull request #354 from yuwata/spec-s390x
|
|
|
d9da667 |
|
|
|
d9da667 |
spec: do not package s390 specific modules
|
|
|
d9da667 |
---
|
|
|
d9da667 |
dracut.spec | 41 ++++++++++++++++++++++++++++++-----------
|
|
|
d9da667 |
1 file changed, 30 insertions(+), 11 deletions(-)
|
|
|
d9da667 |
|
|
|
d9da667 |
diff --git a/dracut.spec b/dracut.spec
|
|
|
d9da667 |
index 08e5a098..11c7459a 100644
|
|
|
d9da667 |
--- a/dracut.spec
|
|
|
d9da667 |
+++ b/dracut.spec
|
|
|
d9da667 |
@@ -284,6 +284,19 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/97masterkey
|
|
|
d9da667 |
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
|
|
|
d9da667 |
%endif
|
|
|
d9da667 |
|
|
|
d9da667 |
+%infarch s390 s390x
|
|
|
d9da667 |
+# remove architecture specific modules
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/80cms
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/91zipl
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_mod
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dasd_rules
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95dcssblk
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95zfcp_rules
|
|
|
d9da667 |
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/95znet
|
|
|
d9da667 |
+%endif
|
|
|
d9da667 |
+
|
|
|
d9da667 |
mkdir -p $RPM_BUILD_ROOT/boot/dracut
|
|
|
d9da667 |
mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay
|
|
|
d9da667 |
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
|
|
|
d9da667 |
@@ -385,7 +398,6 @@ rm -rf -- $RPM_BUILD_ROOT
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/45url-lib
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/50drm
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/50plymouth
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/80cms
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/80lvmmerge
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/90btrfs
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/90crypt
|
|
|
d9da667 |
@@ -400,29 +412,34 @@ rm -rf -- $RPM_BUILD_ROOT
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/91crypt-gpg
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/91crypt-loop
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95debug
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95fstab-sys
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95lunmask
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95resume
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95rootfs-block
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95terminfo
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95udev-rules
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95virtfs
|
|
|
d9da667 |
+%ifarch s390 s390x
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/80cms
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/91zipl
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95dasd
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95dasd_mod
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95dasd_rules
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95fstab-sys
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95lunmask
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95dcssblk
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95zfcp
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95zfcp_rules
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95terminfo
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95udev-rules
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95virtfs
|
|
|
d9da667 |
+%endif
|
|
|
d9da667 |
%if %{undefined _unitdir}
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/96securityfs
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/97masterkey
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/98integrity
|
|
|
d9da667 |
%endif
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/97biosdevname
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/98dracut-systemd
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/98ecryptfs
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/98pollcdrom
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/98selinux
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/98syslog
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/98dracut-systemd
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/98usrmount
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/99base
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/99fs-lib
|
|
|
d9da667 |
@@ -456,17 +473,19 @@ rm -rf -- $RPM_BUILD_ROOT
|
|
|
d9da667 |
%defattr(-,root,root,0755)
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/02systemd-networkd
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/40network
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/45ifcfg
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/90kernel-network-modules
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95fcoe
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95iscsi
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/90qemu-net
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95cifs
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95fcoe
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95fcoe-uefi
|
|
|
d9da667 |
+%{dracutlibdir}/modules.d/95iscsi
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95nbd
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95nfs
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95ssh-client
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/45ifcfg
|
|
|
d9da667 |
+%ifarch s390 s390x
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/95znet
|
|
|
d9da667 |
-%{dracutlibdir}/modules.d/95fcoe-uefi
|
|
|
d9da667 |
+%endif
|
|
|
d9da667 |
%{dracutlibdir}/modules.d/99uefi-lib
|
|
|
d9da667 |
|
|
|
d9da667 |
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
|
|
|
d9da667 |
|