X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=8018a2113257545ce8ea463592e5ec1983e308ca;hb=d072bfc;hp=ea8afb72a29bfef3e2d2cc35eba4d3dfdb2fc79a;hpb=f039d47e372a334e2cc0a21ecf2f8d14c90fec19;p=packages%2Fdracut.git

diff --git a/dracut.spec b/dracut.spec
index ea8afb7..8018a21 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,25 +1,28 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	036
-Release:	1
+Version:	047
+Release:	3
 License:	GPL v2+
 Group:		Base
-Source0:	http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	cae7b6252aacca350f3791f15edb5840
+Source0:	https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
+# Source0-md5:	62d474ccb8411ec4a76ba5c79bc1093a
 Source1:	pld.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
+Patch0:		plymouth-libdir.patch
+Patch1:		os-release.patch
+Patch2:		arch-libdir.patch
+Patch3:		systemd-paths.patch
+Patch4:		prelink-libs.patch
+Patch5:		cryptsetup.patch
+Patch6:		ext4-crc32c.patch
 URL:		https://dracut.wiki.kernel.org/
 BuildRequires:	asciidoc
 BuildRequires:	dash
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
+BuildRequires:	kmod-devel >= 23
 BuildRequires:	libxslt-progs
+BuildRequires:	pkgconfig
 Requires:	bash
 Requires:	coreutils
 Requires:	cpio
@@ -29,6 +32,7 @@ Requires:	glibc-misc
 Requires:	grep
 Requires:	gzip
 Requires:	hardlink
+Requires:	kmod >= 23
 Requires:	sed
 Requires:	systemd-units
 Requires:	udev
@@ -61,6 +65,7 @@ Suggests:	syslogdaemon
 Suggests:	xfsprogs
 Suggests:	xz
 Conflicts:	kmod < 6
+Conflicts:	plymounth < 0.9.3-1
 Conflicts:	systemd < 1:199
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -92,12 +97,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
 
@@ -188,6 +193,7 @@ Bashowe dopełnianie składni dla polecenia dracut.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -195,11 +201,16 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch5 -p1
 %patch6 -p1
 
-%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
+%{__sed} -i -e 's,@libexecdir@,%{_libexecdir},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}"
@@ -210,24 +221,21 @@ 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
 install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
 
-echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
+echo "DRACUT_VERSION=%{version}-%{release}" >$RPM_BUILD_ROOT%{dracutlibdir}/dracut-version.sh
 
 # create compat symlink
 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
@@ -249,6 +257,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
@@ -257,8 +266,10 @@ 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/00systemd
+%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd/module-setup.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
@@ -279,13 +290,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh
 %dir %{dracutlibdir}/modules.d/80cms
 %attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh
+%dir %{dracutlibdir}/modules.d/80lvmmerge
+%{dracutlibdir}/modules.d/80lvmmerge/README.md
+%attr(755,root,root) %{dracutlibdir}/modules.d/80lvmmerge/*.sh
+%dir %{dracutlibdir}/modules.d/81cio_ignore
+%attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh
 %dir %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90btrfs/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90btrfs/*.sh
 %dir %{dracutlibdir}/modules.d/90crypt
 %attr(755,root,root) %{dracutlibdir}/modules.d/90crypt/*.sh
-%dir %{dracutlibdir}/modules.d/91crypt-loop
-%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
 %dir %{dracutlibdir}/modules.d/90dm
 %{dracutlibdir}/modules.d/90dm/*.rules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dm/*.sh
@@ -295,6 +309,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d/90dmsquash-live
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live/*.sh
 %{dracutlibdir}/modules.d/90dmsquash-live/checkisomd5@.service
+%dir %{dracutlibdir}/modules.d/90dmsquash-live-ntfs
+%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-ntfs/*.sh
 %dir %{dracutlibdir}/modules.d/90kernel-modules
 %attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules/*.sh
 %dir %{dracutlibdir}/modules.d/90lvm
@@ -304,13 +320,25 @@ 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/90multipath-hostonly
+%attr(755,root,root) %{dracutlibdir}/modules.d/90multipath-hostonly/*.sh
 %dir %{dracutlibdir}/modules.d/90qemu
 %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh
 %dir %{dracutlibdir}/modules.d/91crypt-gpg
+%{dracutlibdir}/modules.d/91crypt-gpg/README
 %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh
+%dir %{dracutlibdir}/modules.d/91crypt-loop
+%attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-loop/*.sh
+%dir %{dracutlibdir}/modules.d/91zipl
+%attr(755,root,root) %{dracutlibdir}/modules.d/91zipl/*.sh
+%dir %{dracutlibdir}/modules.d/95dcssblk
+%attr(755,root,root) %{dracutlibdir}/modules.d/95dcssblk/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
 %attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh
+%dir %{dracutlibdir}/modules.d/95lunmask
+%attr(755,root,root) %{dracutlibdir}/modules.d/95lunmask/*.sh
 %dir %{dracutlibdir}/modules.d/95resume
 %attr(755,root,root) %{dracutlibdir}/modules.d/95resume/*.sh
 %dir %{dracutlibdir}/modules.d/95rootfs-block
@@ -357,11 +385,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
@@ -378,10 +406,16 @@ 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.bootup.7*
 %{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.modules.7*
@@ -395,13 +429,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/dracut-pre-udev.service.8*
 %{_mandir}/man8/dracut-shutdown.service.8*
 %{_mandir}/man8/mkinitrd.8*
-%{_mandir}/man7/dracut.bootup.7.gz
 
 #/usr/lib/kernel/install.d/50-dracut.install
 #/usr/lib/kernel/install.d/51-dracut-rescue.install
 
 %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
@@ -409,6 +444,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