Only install plymouth logo file if it exists

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index c79d12cc9b0c6300e352c25e786ef26afd786052..939c426d9f83ec622342b84e2ba020c26ec42738 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,17 +1,18 @@
 Summary:       Initramfs generator using udev
 Name:          dracut
-Version:       018
-Release:       5
+Version:       020
+Release:       4
 License:       GPL v2+
 Group:         Base
 Source0:       ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: e65f2a54b6d64619334f501a346f7823
+# Source0-md5: da9e5a083cd9081bb71cc7df2f0daedc
 Source1:       pld.conf
 Patch0:                no-rh.patch
 Patch1:                bash-sh.patch
 Patch2:                plymouth-libexec.patch
 Patch3:                reboot-opts.patch
 Patch4:                os-release.patch
+Patch5:                plymouth-logo.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
@@ -30,8 +31,12 @@ Requires:    sed
 Requires:      systemd-units
 Requires:      udev
 Requires:      util-linux >= 2.20
+Requires:      vim-rt
+Requires:      vim-static
 Requires:      virtual(module-tools)
-Suggests:      biosdevname
+# disabled due to angry (bug)reports, because it changes well known
+# net device names from ethX to emX or pXpY
+#Suggests:     biosdevname
 Suggests:      btrfs-progs
 Suggests:      busybox
 Suggests:      bzip2
@@ -54,7 +59,6 @@ Suggests:     syslogdaemon
 Suggests:      xfsprogs
 Suggests:      xz
 Conflicts:     kmod < 6
-BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dracutlibdir    %{_prefix}/lib/dracut
@@ -130,11 +134,12 @@ configuration.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 
@@ -153,8 +158,6 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \
        sysconfdir=%{_sysconfdir} \
        mandir=%{_mandir}
 
-echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/10rpmversion/dracut-version
-
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/01-dist.conf
 install -p dracut.conf.d/fips.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d/40-fips.conf
 install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
@@ -178,6 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 # compat symlink
 %attr(755,root,root) /sbin/dracut
 %attr(755,root,root) %{_bindir}/dracut
+%attr(755,root,root) %{_bindir}/dracut-install
 %attr(755,root,root) %{_bindir}/mkinitrd
 %attr(755,root,root) %{_bindir}/lsinitrd
 %dir %{dracutlibdir}
@@ -192,15 +196,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
 %dir %{dracutlibdir}/modules.d/01bash
 %attr(755,root,root) %{dracutlibdir}/modules.d/01bash/*.sh
+%dir %{dracutlibdir}/modules.d/04watchdog
+%attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh
 %dir %{dracutlibdir}/modules.d/05busybox
 %attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh
 %dir %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/10i18n/README
 %{dracutlibdir}/modules.d/10i18n/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh
-%dir %{dracutlibdir}/modules.d/10rpmversion
-%{dracutlibdir}/modules.d/10rpmversion/dracut-version
-%attr(755,root,root) %{dracutlibdir}/modules.d/10rpmversion/*.sh
 %dir %{dracutlibdir}/modules.d/30convertfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh
 %dir %{dracutlibdir}/modules.d/50plymouth
@@ -230,6 +233,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh
 %dir %{dracutlibdir}/modules.d/90multipath
 %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh
+%dir %{dracutlibdir}/modules.d/90qemu
+%attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
@@ -252,6 +257,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d/95udev-rules
 %{dracutlibdir}/modules.d/95udev-rules/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/95udev-rules/*.sh
+%dir %{dracutlibdir}/modules.d/95virtfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/95virtfs/*.sh
 %dir %{dracutlibdir}/modules.d/96securityfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/96securityfs/*.sh
 %dir %{dracutlibdir}/modules.d/97biosdevname
@@ -273,6 +280,10 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/98syslog/README
 %{dracutlibdir}/modules.d/98syslog/rsyslog.conf
 %attr(755,root,root) %{dracutlibdir}/modules.d/98syslog/*.sh
+%dir %{dracutlibdir}/modules.d/98systemd
+%{dracutlibdir}/modules.d/98systemd/*.service
+%{dracutlibdir}/modules.d/98systemd/*.target
+%attr(755,root,root) %{dracutlibdir}/modules.d/98systemd/*.sh
 %dir %{dracutlibdir}/modules.d/98usrmount
 %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh
 %dir %{dracutlibdir}/modules.d/99base
@@ -283,8 +294,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/99img-lib/*.sh
 %dir %{dracutlibdir}/modules.d/99shutdown
 %attr(755,root,root) %{dracutlibdir}/modules.d/99shutdown/*.sh
+%attr(755,root,root) %{dracutlibdir}/dracut-version.sh
+
 %dir /var/lib/initramfs
 %{systemdunitdir}/*.service
+%{systemdunitdir}/*.target
 %{systemdunitdir}/*/*.service
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man7/dracut.kernel.7*
@@ -302,6 +316,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh
 %dir %{dracutlibdir}/modules.d/90livenet
 %attr(755,root,root) %{dracutlibdir}/modules.d/90livenet/*.sh
+%dir %{dracutlibdir}/modules.d/90qemu-net
+%attr(755,root,root) %{dracutlibdir}/modules.d/90qemu-net/*.sh
 %dir %{dracutlibdir}/modules.d/95fcoe
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe/*.sh
 %dir %{dracutlibdir}/modules.d/95iscsi