X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=b107639751eafff74af55bf8a1e33510a0396eea;hb=cfe0e4e788101c69cd5b96f7f88962439b844fcf;hp=bdc6f12894c883e5aafaaafbc1bc3e9f426d3665;hpb=b8802c386fe71a8c68408b29dce85e7be9f08d3e;p=packages%2Fdracut.git

diff --git a/dracut.spec b/dracut.spec
index bdc6f12..b107639 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,30 +1,34 @@
 Summary:	Initramfs generator using udev
 Summary(pl.UTF-8):	Generator initramfs wykorzystujący udev
 Name:		dracut
-Version:	037
+Version:	047
 Release:	4
 License:	GPL v2+
 Group:		Base
 Source0:	https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	866982a7ab49e3e4442fe966eeff4111
+# Source0-md5:	62d474ccb8411ec4a76ba5c79bc1093a
 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:		misc_fixes.patch
-Patch100:	git.patch
+Source2:	update-initramfs
+Patch1:		os-release.patch
+Patch2:		arch-libdir.patch
+Patch3:		prelink-libs.patch
+Patch4:		config.patch
+Patch5:		compressors.patch
+Patch6:		proc_sys_remount.patch
+Patch7:		misc_fixes.patch
+Patch8:		initrd-release.patch
+Patch9:		no_systemd_udevd.patch
+Patch10:	ext4.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:	bzip2
 Requires:	coreutils
 Requires:	cpio
 Requires:	filesystem
@@ -33,19 +37,19 @@ Requires:	glibc-misc
 Requires:	grep
 Requires:	gzip
 Requires:	hardlink
+Requires:	kmod >= 23
 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
@@ -63,9 +67,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
@@ -96,7 +98,7 @@ Requires:	bridge-utils
 Requires:	dhcp-client
 Requires:	iproute2
 Requires:	iputils-arping
-Requires:	iputils-ping
+Requires:	ping
 Requires:	nbd
 Requires:	net-tools
 Requires:	nfs-utils-clients
@@ -196,18 +198,21 @@ Bashowe dopełnianie składni dla polecenia dracut.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch100 -p1
+%patch10 -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}"
@@ -218,14 +223,10 @@ 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 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-initramfs
 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
 
@@ -237,6 +238,14 @@ 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,01systemd-initrd,02systemd-networkd,98dracut-systemd}
+%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90multipath/multipathd,90dmsquash-live/checkisomd5@}.service
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -252,11 +261,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dracut
 %attr(755,root,root) %{_bindir}/mkinitrd
 %attr(755,root,root) %{_bindir}/lsinitrd
+%attr(755,root,root) %{_bindir}/update-initramfs
 %dir %{dracutlibdir}
 %attr(755,root,root) %{dracutlibdir}/dracut-install
 %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
@@ -265,8 +276,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
@@ -287,13 +296,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
@@ -302,7 +314,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dracutlibdir}/modules.d/90dmraid/*.sh
 %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
@@ -313,12 +326,23 @@ 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/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
@@ -365,11 +389,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
@@ -386,24 +405,17 @@ 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.bootup.7*
 %{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.modules.7*
 %{_mandir}/man8/dracut.8*
-%{_mandir}/man8/dracut-cmdline.service.8*
-%{_mandir}/man8/dracut-initqueue.service.8*
-%{_mandir}/man8/dracut-mount.service.8*
-%{_mandir}/man8/dracut-pre-mount.service.8*
-%{_mandir}/man8/dracut-pre-pivot.service.8*
-%{_mandir}/man8/dracut-pre-trigger.service.8*
-%{_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
@@ -417,6 +429,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