- don't link udevd as systemd-udevd

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index 2941723ea1cb2bbd5373e608c91ea3f3e65a4d2d..581d25538895baf498bac2d490f9712b6a2af7d8 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,24 +1,24 @@
 Summary:       Initramfs generator using udev
 Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       037
-Release:       4
+Version:       043
+Release:       2
 License:       GPL v2+
 Group:         Base
 Source0:       https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5: 866982a7ab49e3e4442fe966eeff4111
+# Source0-md5: 85de75ddf00962e7bb0ae387f05794e5
 Source1:       tld.conf
 Patch1:                plymouth-libexec.patch
 Patch2:                os-release.patch
 Patch3:                plymouth-logo.patch
 Patch4:                arch-libdir.patch
-Patch5:                systemd-paths.patch
 Patch6:                prelink-libs.patch
 Patch7:                config.patch
 Patch8:                xz_compressor.patch
 Patch9:                proc_sys_remount.patch
 Patch10:       misc_fixes.patch
-Patch100:      git.patch
+Patch11:       initrd-release.patch
+Patch12:       no_systemd_udevd.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: asciidoc
 BuildRequires: dash
@@ -26,6 +26,7 @@ BuildRequires:        docbook-dtd45-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: libxslt-progs
 Requires:      bash
+Requires:      bzip2
 Requires:      coreutils
 Requires:      cpio
 Requires:      filesystem
@@ -35,18 +36,17 @@ Requires:   grep
 Requires:      gzip
 Requires:      hardlink
 Requires:      sed
-Requires:      systemd-units
 Requires:      udev
 Requires:      util-linux >= 2.22.2-3
 Requires:      vim-rt
 Requires:      vim-static
 Requires:      virtual(module-tools)
+Requires:      xz
 # 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
 Suggests:      cryptsetup
 Suggests:      dash
 Suggests:      device-mapper
@@ -64,9 +64,7 @@ Suggests:     plymouth
 Suggests:      suspend-utils
 Suggests:      syslogdaemon
 Suggests:      xfsprogs
-Suggests:      xz
 Conflicts:     kmod < 6
-Conflicts:     systemd < 1:199
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dracutlibdir    %{_prefix}/lib/dracut
@@ -197,19 +195,23 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch100 -p1
+%patch11 -p1
+%patch12 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
 find modules.d -name '*.orig' | xargs -r %{__rm}
 
 %build
+# not autoconf generated
+./configure \
+       --sysconfdir=%{_sysconfdir}
+
 %{__make} all doc \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags}"
@@ -220,12 +222,7 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \
        $RPM_BUILD_ROOT/var/{log,lib/{dracut/overlay,initramfs}}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       libdir=%{_prefix}/lib \
-       bindir=%{_bindir} \
-       systemdsystemunitdir=%{systemdunitdir} \
-       sysconfdir=%{_sysconfdir} \
-       mandir=%{_mandir}
+       DESTDIR=$RPM_BUILD_ROOT
 
 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
@@ -239,6 +236,13 @@ ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 # remove gentoo specific modules
 %{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/50gensplash
 
+# SuSE specific man page
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd-suse.8
+
+# remove systemd stuff
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,00systemd-bootchart,01systemd-initrd,02systemd-networkd,98dracut-systemd}
+%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90multipath/multipathd.service
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -267,8 +271,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/00bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/00dash
 %attr(755,root,root) %{dracutlibdir}/modules.d/00dash/*.sh
-%dir %{dracutlibdir}/modules.d/00systemd-bootchart
-%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh
 %dir %{dracutlibdir}/modules.d/03modsign
 %attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
 %dir %{dracutlibdir}/modules.d/03rescue
@@ -367,11 +369,6 @@ 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
-%doc %{dracutlibdir}/modules.d/98systemd/*.8*
 %dir %{dracutlibdir}/modules.d/98usrmount
 %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh
 %dir %{dracutlibdir}/modules.d/99base
@@ -388,8 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/skipcpio
 
 %dir /var/lib/initramfs
-%{systemdunitdir}/*.service
-%{systemdunitdir}/*/*.service
+
+%{_npkgconfigdir}/dracut.pc
+
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
 %{_mandir}/man7/dracut.cmdline.7*
@@ -419,6 +417,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/45ifcfg/*.sh
 %dir %{dracutlibdir}/modules.d/45url-lib
 %attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh
+%dir %{dracutlibdir}/modules.d/90kernel-network-modules
+%attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-network-modules/module-setup.sh
 %dir %{dracutlibdir}/modules.d/90livenet
 %attr(755,root,root) %{dracutlibdir}/modules.d/90livenet/*.sh
 %dir %{dracutlibdir}/modules.d/90qemu-net