X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=ad8daea0082905736ea5c2362e0f3ae8e3ca6533;hb=794114547044a6b01aa0ee5479467af1acd19ae9;hp=ccc08701f89f87203b962b2faaed6716912f8a4c;hpb=2a3b1710e2eda030f57b0ce9908bd0256d4e96b4;p=packages%2Fdracut.git

diff --git a/dracut.spec b/dracut.spec
index ccc0870..ad8daea 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,12 +1,12 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	038
-Release:	2
+Version:	044
+Release:	3
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	4487bd98000cc536c5c3839a2f112831
+# Source0-md5:	fbb8b6aea24c2f7d328021bbf11788fd
 Source1:	pld.conf
 Patch1:		plymouth-libexec.patch
 Patch2:		os-release.patch
@@ -14,7 +14,6 @@ Patch3:		plymouth-logo.patch
 Patch4:		arch-libdir.patch
 Patch5:		systemd-paths.patch
 Patch6:		prelink-libs.patch
-Patch7:		keyctl-path.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
 BuildRequires:	dash
@@ -93,12 +92,12 @@ Requires:	bridge-utils
 Requires:	dhcp-client
 Requires:	iproute2
 Requires:	iputils-arping
-Requires:	iputils-ping
 Requires:	nbd
 Requires:	net-tools
 Requires:	nfs-utils-clients
 Requires:	open-iscsi
 Requires:	openssh-clients
+Requires:	ping
 Requires:	rpcbind
 Suggests:	curl
 
@@ -195,13 +194,17 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -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} \
+	--systemdsystemunitdir=%{systemdunitdir}
+
 %{__make} all doc \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}"
@@ -212,12 +215,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
@@ -230,6 +228,8 @@ 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -251,6 +251,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d
 %attr(755,root,root) %{dracutlibdir}/dracut-functions.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-functions
+%attr(755,root,root) %{dracutlibdir}/dracut-init.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-logger.sh
 %attr(755,root,root) %{dracutlibdir}/dracut-initramfs-restore
 %dir %{dracutlibdir}/modules.d/00bash
@@ -259,8 +260,12 @@ 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
+%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd/module-setup.sh
 %dir %{dracutlibdir}/modules.d/00systemd-bootchart
 %attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-bootchart/*.sh
+%dir %{dracutlibdir}/modules.d/01systemd-initrd
+%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-initrd/module-setup.sh
 %dir %{dracutlibdir}/modules.d/03modsign
 %attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh
 %dir %{dracutlibdir}/modules.d/03rescue
@@ -306,6 +311,7 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/90mdraid/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh
 %dir %{dracutlibdir}/modules.d/90multipath
+%attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.service
 %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh
 %dir %{dracutlibdir}/modules.d/90qemu
 %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
@@ -359,11 +365,11 @@ 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/98dracut-systemd
+%{dracutlibdir}/modules.d/98dracut-systemd/dracut-tmpfiles.conf
+%{dracutlibdir}/modules.d/98dracut-systemd/*.service
+%attr(755,root,root) %{dracutlibdir}/modules.d/98dracut-systemd/*.sh
+%doc %{dracutlibdir}/modules.d/98dracut-systemd/*.8*
 %dir %{dracutlibdir}/modules.d/98usrmount
 %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh
 %dir %{dracutlibdir}/modules.d/99base
@@ -380,8 +386,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/skipcpio
 
 %dir /var/lib/initramfs
-%{systemdunitdir}/*.service
-%{systemdunitdir}/*/*.service
+
+%{systemdunitdir}/dracut-*.service
+%{systemdunitdir}/initrd.target.wants/dracut-*.service
+%{systemdunitdir}/sysinit.target.wants/dracut-shutdown.service
+
+%{_npkgconfigdir}/dracut.pc
+
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man5/dracut.conf.5*
 %{_mandir}/man7/dracut.cmdline.7*
@@ -404,6 +415,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files network
 %defattr(644,root,root,755)
+%dir %{dracutlibdir}/modules.d/02systemd-networkd
+%attr(755,root,root) %{dracutlibdir}/modules.d/02systemd-networkd/module-setup.sh
 %dir %{dracutlibdir}/modules.d/40network
 %{dracutlibdir}/modules.d/40network/dhclient.conf
 %attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.sh
@@ -411,6 +424,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