X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=6077a4edb579a69979c9f2b6fc68bc527bc87828;hb=26d661002dc401efa521c6cdf2d0ee23a6acd9ad;hp=56e55a072f7d0d6a857b10d3b6b1461fdff7612c;hpb=67eb7ce46d7289accc94eed4db903184b5c3cc90;p=packages%2Fdracut.git

diff --git a/dracut.spec b/dracut.spec
index 56e55a0..6077a4e 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,16 +1,19 @@
 Summary:	Initramfs generator using udev
 Name:		dracut
-Version:	017
+Version:	023
 Release:	1
 License:	GPL v2+
 Group:		Base
 Source0:	ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
-# Source0-md5:	8c966954cd973b5abbd7193368f1d5cc
+# Source0-md5:	7ae42fa8272363400ee6161c47d1beb5
 Source1:	pld.conf
 Patch0:		no-rh.patch
-Patch1:		create-target-dir-for-symlink.patch
-Patch2:		bash-sh.patch
+Patch1:		bash-sh.patch
+Patch2:		plymouth-libexec.patch
+Patch4:		os-release.patch
+Patch5:		plymouth-logo.patch
 URL:		https://dracut.wiki.kernel.org/
+BuildRequires:	dash
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	libxslt-progs
@@ -19,6 +22,7 @@ Requires:	coreutils
 Requires:	cpio
 Requires:	filesystem
 Requires:	findutils
+Requires:	glibc-misc
 Requires:	grep
 Requires:	gzip
 Requires:	hardlink
@@ -26,12 +30,34 @@ Requires:	sed
 Requires:	systemd-units
 Requires:	udev
 Requires:	util-linux >= 2.20
+Requires:	vim-rt
+Requires:	vim-static
 Requires:	virtual(module-tools)
+# 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
+Suggests:	dmraid
+Suggests:	e2fsprogs
+Suggests:	gnupg
+Suggests:	kbd
+Suggests:	keyutils
+Suggests:	libselinux-utils
+Suggests:	losetup
+Suggests:	lvm2
+Suggests:	mdadm
+Suggests:	multipath-tools
+Suggests:	plymouth
+Suggests:	suspend-utils
+Suggests:	syslogdaemon
+Suggests:	xfsprogs
 Suggests:	xz
 Conflicts:	kmod < 6
-BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		dracutlibdir	%{_prefix}/lib/dracut
@@ -48,6 +74,18 @@ dracut-network package.
 Summary:	Dracut modules to build a dracut initramfs with network support
 Group:		Base
 Requires:	%{name} = %{version}-%{release}
+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:	rpcbind
+Suggests:	curl
 
 %description network
 This package requires everything which is needed to build a generic
@@ -95,9 +133,13 @@ configuration.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch4 -p1
+%patch5 -p1
+
+%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
 
 %build
 %{__make}
@@ -114,8 +156,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
@@ -139,6 +179,7 @@ rm -rf $RPM_BUILD_ROOT
 # compat symlink
 %attr(755,root,root) /sbin/dracut
 %attr(755,root,root) %{_bindir}/dracut
+%attr(755,root,root) %{dracutlibdir}/dracut-install
 %attr(755,root,root) %{_bindir}/mkinitrd
 %attr(755,root,root) %{_bindir}/lsinitrd
 %dir %{dracutlibdir}
@@ -153,26 +194,27 @@ 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/45url-lib
-%attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh
 %dir %{dracutlibdir}/modules.d/50plymouth
 %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/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
@@ -191,8 +233,12 @@ 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/95cifs
+%attr(755,root,root) %{dracutlibdir}/modules.d/95cifs/*.sh
 %dir %{dracutlibdir}/modules.d/95debug
 %attr(755,root,root) %{dracutlibdir}/modules.d/95debug/*.sh
 %dir %{dracutlibdir}/modules.d/95resume
@@ -213,6 +259,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
@@ -226,12 +274,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d/98integrity
 %{dracutlibdir}/modules.d/98integrity/README
 %attr(755,root,root) %{dracutlibdir}/modules.d/98integrity/*.sh
+%dir %{dracutlibdir}/modules.d/98pollcdrom
+%attr(755,root,root) %{dracutlibdir}/modules.d/98pollcdrom/*.sh
 %dir %{dracutlibdir}/modules.d/98selinux
 %attr(755,root,root) %{dracutlibdir}/modules.d/98selinux/*.sh
 %dir %{dracutlibdir}/modules.d/98syslog
 %{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
@@ -242,10 +297,15 @@ 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}/*/*.service
 %{_mandir}/man8/dracut.8*
+%{_mandir}/man8/dracut-*.8*
+%{_mandir}/man8/initrd-switch-root.service.8*
+%{_mandir}/man8/udevadm-cleanup-db.service.8*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man5/dracut.conf.5*
@@ -255,43 +315,48 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dracutlibdir}/modules.d/40network
 %{dracutlibdir}/modules.d/40network/dhclient.conf
 %attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.sh
+%dir %{dracutlibdir}/modules.d/45ifcfg
+%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/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
 %attr(755,root,root) %{dracutlibdir}/modules.d/95iscsi/*.sh
-%dir %{dracutlibdir}/modules.d/90livenet
-%attr(755,root,root) %{dracutlibdir}/modules.d/90livenet/*.sh
 %dir %{dracutlibdir}/modules.d/95nbd
 %attr(755,root,root) %{dracutlibdir}/modules.d/95nbd/*.sh
 %dir %{dracutlibdir}/modules.d/95nfs
 %attr(755,root,root) %{dracutlibdir}/modules.d/95nfs/*.sh
 %dir %{dracutlibdir}/modules.d/95ssh-client
 %attr(755,root,root) %{dracutlibdir}/modules.d/95ssh-client/*.sh
-%dir %{dracutlibdir}/modules.d/45ifcfg
-%attr(755,root,root) %{dracutlibdir}/modules.d/45ifcfg/*.sh
 %dir %{dracutlibdir}/modules.d/95znet
 %attr(755,root,root) %{dracutlibdir}/modules.d/95znet/*.sh
 
 %files fips
 %defattr(644,root,root,755)
-%{dracutlibdir}/modules.d/01fips
+%dir %{dracutlibdir}/modules.d/01fips
+%attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/40-fips.conf
 
 %files fips-aesni
 %defattr(644,root,root,755)
 %doc COPYING
+%dir %{dracutlibdir}/modules.d/02fips-aesni
 %attr(755,root,root) %{dracutlibdir}/modules.d/02fips-aesni/*.sh
 
 %files caps
 %defattr(644,root,root,755)
 %{dracutlibdir}/modules.d/02caps/README
+%dir %{dracutlibdir}/modules.d/02caps
 %attr(755,root,root) %{dracutlibdir}/modules.d/02caps/*.sh
 
 %files tools
 %defattr(644,root,root,755)
-%{_mandir}/man8/dracut-gencmdline.8*
 %{_mandir}/man8/dracut-catimages.8*
-%attr(755,root,root) %{_bindir}/dracut-gencmdline
 %attr(755,root,root) %{_bindir}/dracut-catimages
 %dir /boot/dracut
 %dir /var/lib/dracut