- cifs requires network, move it to proper package

[packages/dracut.git] / dracut.spec

diff --git a/dracut.spec b/dracut.spec
index 01d5458642e94c68bc0689019608f91e2dc0d5e5..f021e8e1a659e1d9fcc49a99980dd13882ecb901 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,16 +1,20 @@
 Summary:       Initramfs generator using udev
+Summary(pl.UTF-8):     Generator initramfs wykorzystujący udev
 Name:          dracut
-Version:       017
+Version:       023
 Release:       2
 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 +23,7 @@ Requires:     coreutils
 Requires:      cpio
 Requires:      filesystem
 Requires:      findutils
+Requires:      glibc-misc
 Requires:      grep
 Requires:      gzip
 Requires:      hardlink
@@ -26,12 +31,16 @@ Requires:   sed
 Requires:      systemd-units
 Requires:      udev
 Requires:      util-linux >= 2.20
+Requires:      vim-rt
+Requires:      vim-static
 Requires:      virtual(module-tools)
-Suggests:      biosdevname
+# 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-luks
+Suggests:      cryptsetup
 Suggests:      dash
 Suggests:      device-mapper
 Suggests:      dmraid
@@ -50,7 +59,6 @@ Suggests:     syslogdaemon
 Suggests:      xfsprogs
 Suggests:      xz
 Conflicts:     kmod < 6
-BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dracutlibdir    %{_prefix}/lib/dracut
@@ -63,12 +71,22 @@ which are driven by the event-based udev. Having root on MD, DM, LVM2,
 LUKS is supported as well as NFS, iSCSI, NBD, FCoE with the
 dracut-network package.
 
+%description -l pl.UTF-8
+Dracut zawiera narzędzia do tworzenia uruchamialnych obrazów initramfs
+dla jąder Linuksa 2.6. W przeciwieństwie do wcześniejszych
+implementacji, dracut zaszywa możliwie najmniej stałych w initramfs.
+Zawiera różne moduły sterowane w oparciu o zdarzenia udev. Obsługiwane
+jest przechowywanie głównego systemu plików na urządzeniach MD, DM,
+LVM2, LUKS, a po doinstalowaniu pakietu dracut-network także poprzez
+NFS, iSCSI, NBD, FCoE.
+
 %package network
 Summary:       Dracut modules to build a dracut initramfs with network support
+Summary(pl.UTF-8):     Moduły Dracuta do tworzenia initramfs z obsługą sieci
 Group:         Base
 Requires:      %{name} = %{version}-%{release}
 Requires:      bridge-utils
-Requires:      dhclient
+Requires:      dhcp-client
 Requires:      iproute2
 Requires:      iputils-arping
 Requires:      iputils-ping
@@ -84,8 +102,14 @@ Suggests:   curl
 This package requires everything which is needed to build a generic
 all purpose initramfs with network support with dracut.
 
+%description network -l pl.UTF-8
+Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
+dracuta zwykłych obrazów initramfs dowolnego przeznaczenia z obsługą
+sieci.
+
 %package fips
 Summary:       Dracut modules to build a dracut initramfs with an integrity check
+Summary(pl.UTF-8):     Moduły Dracuta do tworzenia initramfs z kontrolą spójności
 Group:         Base
 Requires:      %{name} = %{version}-%{release}
 Requires:      hmaccalc
@@ -95,8 +119,14 @@ Requires:   nss-softokn-freebl
 This package requires everything which is needed to build an all
 purpose initramfs with dracut, which does an integrity check.
 
+%description fips -l pl.UTF-8
+Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
+dracuta obrazów initramfs dowolnego przeznaczenia, wykonujących
+kontrolę własnej spójności.
+
 %package fips-aesni
 Summary:       Dracut modules to build a dracut initramfs with an integrity check with aesni-intel
+Summary(pl.UTF-8):     Moduły Dracuta do tworzenia initramfs z kontrolą spójności przez aesni-intel
 Group:         Base
 Requires:      %{name}-fips = %{version}-%{release}
 
@@ -105,8 +135,14 @@ This package requires everything which is needed to build an all
 purpose initramfs with dracut, which does an integrity check and adds
 the aesni-intel kernel module.
 
+%description fips-aesni -l pl.UTF-8
+Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
+dracuta obrazów initramfs dowolnego przeznaczenia wykonujących
+kontrolę własnej spójności z dodanym modułem jądra aesni-intel.
+
 %package caps
 Summary:       Dracut modules to build a dracut initramfs which drops capabilities
+Summary(pl.UTF-8):     Moduły Dracuta do tworzenia initramfs zrzucającego uprawnienia
 Group:         Base
 Requires:      %{name} = %{version}-%{release}
 Requires:      libcap
@@ -115,8 +151,14 @@ Requires:  libcap
 This package requires everything which is needed to build an all
 purpose initramfs with dracut, which drops capabilities.
 
+%description caps -l pl
+Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu
+dracuta obrazów initramfs dowolnego przeznaczenia zrzucających
+uprawnienia.
+
 %package tools
 Summary:       Dracut tools to build the local initramfs
+Summary(pl.UTF-8):     Narzędzia Dracuta do tworzenia lokalnych initramfs
 Group:         Base
 Requires:      %{name} = %{version}-%{release}
 
@@ -124,29 +166,39 @@ Requires: %{name} = %{version}-%{release}
 This package contains tools to assemble the local initrd and host
 configuration.
 
+%description tools -l pl.UTF-8
+Ten pakiet zawiera narzędzia do łączenia lokalnych initrd oraz
+konfiguracji maszyn.
+
 %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
+find modules.d -name '*.orig' | xargs -r %{__rm}
 
 %build
-%{__make}
+%{__make} all doc \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 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 \
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
        libdir=%{_prefix}/lib \
        bindir=%{_bindir} \
        systemdsystemunitdir=%{systemdunitdir} \
        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
@@ -155,14 +207,14 @@ install -p dracut.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/dracut_log
 ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut
 
 # remove gentoo specific modules
-%{__rm} -r $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
+%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/50gensplash
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
+%doc AUTHORS HACKING NEWS README TODO dracut.html dracut.png dracut.svg
 %dir %{_sysconfdir}/dracut.conf.d
 %config(noreplace) %{_sysconfdir}/dracut.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/01-dist.conf
@@ -173,6 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mkinitrd
 %attr(755,root,root) %{_bindir}/lsinitrd
 %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
@@ -184,24 +237,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/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
@@ -220,6 +276,8 @@ 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/95debug
@@ -242,6 +300,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
@@ -255,12 +315,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
@@ -271,13 +338,20 @@ 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}/man1/lsinitrd.1*
+%{_mandir}/man5/dracut.conf.5*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.cmdline.7*
-%{_mandir}/man5/dracut.conf.5*
+%{_mandir}/man8/dracut.8*
+%{_mandir}/man8/dracut-*.8*
+%{_mandir}/man8/initrd-switch-root.service.8*
+%{_mandir}/man8/mkinitrd.8*
+%{_mandir}/man8/udevadm-cleanup-db.service.8*
 
 %files network
 %defattr(644,root,root,755)
@@ -290,6 +364,10 @@ rm -rf $RPM_BUILD_ROOT
 %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/95cifs
+%attr(755,root,root) %{dracutlibdir}/modules.d/95cifs/*.sh
 %dir %{dracutlibdir}/modules.d/95fcoe
 %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe/*.sh
 %dir %{dracutlibdir}/modules.d/95iscsi
@@ -305,25 +383,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
+%{_mandir}/man8/dracut-catimages.8*
 %dir /boot/dracut
 %dir /var/lib/dracut
 %dir /var/lib/dracut/overlay