46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 33b560fcc2c77cef5a53839b39ac38b4c1ed978c Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@hoyer.xyz>
|
|
Date: Tue, 16 Jan 2018 10:15:38 +0100
|
|
Subject: [PATCH] Merge pull request #356 from yuwata/spec-s390-2
|
|
|
|
spec: remove 81cio_ignore module from non-s390 arch
|
|
---
|
|
AUTHORS | 2 +-
|
|
dracut.spec | 2 ++
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/AUTHORS b/AUTHORS
|
|
index 7be1072f..29670e42 100644
|
|
--- a/AUTHORS
|
|
+++ b/AUTHORS
|
|
@@ -69,7 +69,7 @@ Silvio Fricke <silvio.fricke@gmail.com>
|
|
Stig Telfer <stelfer@cray.com>
|
|
Vasiliy Tolstov <v.tolstov@selfip.ru>
|
|
Wim Muskee <wimmuskee@gmail.com>
|
|
-yuwata <watanabe.yu+github@gmail.com>
|
|
+Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Alan Jenkins <alan-jenkins@tuffmail.co.uk>
|
|
Alan Pevec <apevec@redhat.com>
|
|
Alex Harpin <development@landsofshadow.co.uk>
|
|
diff --git a/dracut.spec b/dracut.spec
|
|
index 81a5098c..c52364b8 100644
|
|
--- a/dracut.spec
|
|
+++ b/dracut.spec
|
|
@@ -287,6 +287,7 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/98integrity
|
|
%ifnarch s390 s390x
|
|
# remove architecture specific modules
|
|
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/80cms
|
|
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/81cio_ignore
|
|
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
|
|
@@ -421,6 +422,7 @@ rm -rf -- $RPM_BUILD_ROOT
|
|
%{dracutlibdir}/modules.d/95virtfs
|
|
%ifarch s390 s390x
|
|
%{dracutlibdir}/modules.d/80cms
|
|
+%{dracutlibdir}/modules.d/81cio_ignore
|
|
%{dracutlibdir}/modules.d/91zipl
|
|
%{dracutlibdir}/modules.d/95dasd
|
|
%{dracutlibdir}/modules.d/95dasd_mod
|
|
|