X-Git-Url: https://git.pld-linux.org/?p=packages%2Fdracut.git;a=blobdiff_plain;f=dracut.spec;h=94b13863c140710844f88ba57f18f01b3b169aba;hp=d1397c8611832cff8023032b560f87d65f932929;hb=84fc318;hpb=7839dccec3eb182c935a935c9e22999d690140c8 diff --git a/dracut.spec b/dracut.spec index d1397c8..94b1386 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,26 +1,24 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 046 -Release: 2 +Version: 049 +Release: 1 License: GPL v2+ Group: Base -Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 224b67e9bc079e013541a74e85659188 +Source0: https://git.kernel.org/pub/scm/boot/dracut/dracut.git/snapshot/%{name}-%{version}.tar.gz +# Source0-md5: 614fc43ab6074fb7c48c0d38979dc9df 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 -Patch7: cryptsetup.patch +Patch0: plymouth-libdir.patch +Patch1: os-release.patch +Patch2: arch-libdir.patch +Patch3: systemd-paths.patch +Patch4: cryptsetup.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: asciidoc BuildRequires: dash BuildRequires: docbook-dtd45-xml BuildRequires: docbook-style-xsl -BuildRequires: kmod-devel >= 15 +BuildRequires: kmod-devel >= 23 BuildRequires: libxslt-progs BuildRequires: pkgconfig Requires: bash @@ -32,6 +30,7 @@ Requires: glibc-misc Requires: grep Requires: gzip Requires: hardlink +Requires: kmod >= 23 Requires: sed Requires: systemd-units Requires: udev @@ -64,6 +63,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) @@ -120,6 +120,7 @@ Group: Base Requires: %{name} = %{version}-%{release} Requires: hmaccalc Requires: nss-softokn-freebl +Obsoletes: dracut-fips-aesni %description fips This package requires everything which is needed to build an all @@ -130,22 +131,6 @@ 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} - -%description fips-aesni -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 @@ -191,15 +176,13 @@ Bashowe dopełnianie składni dla polecenia dracut. %prep %setup -q +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %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,@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} @@ -225,7 +208,7 @@ 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 @@ -266,8 +249,8 @@ rm -rf $RPM_BUILD_ROOT %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/00warpclock +%attr(755,root,root) %{dracutlibdir}/modules.d/00warpclock/*.sh %dir %{dracutlibdir}/modules.d/01systemd-initrd %attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-initrd/module-setup.sh %dir %{dracutlibdir}/modules.d/03modsign @@ -293,13 +276,13 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -313,6 +296,8 @@ rm -rf $RPM_BUILD_ROOT %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/90kernel-modules-extra +%attr(755,root,root) %{dracutlibdir}/modules.d/90kernel-modules-extra/*.sh %dir %{dracutlibdir}/modules.d/90lvm %{dracutlibdir}/modules.d/90lvm/*.rules %attr(755,root,root) %{dracutlibdir}/modules.d/90lvm/*.sh @@ -322,15 +307,24 @@ rm -rf $RPM_BUILD_ROOT %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/90stratis +%attr(755,root,root) %{dracutlibdir}/modules.d/90stratis/*.service +%attr(755,root,root) %{dracutlibdir}/modules.d/90stratis/*.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 @@ -345,6 +339,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh %dir %{dracutlibdir}/modules.d/95fstab-sys %attr(755,root,root) %{dracutlibdir}/modules.d/95fstab-sys/*.sh +%dir %{dracutlibdir}/modules.d/95qeth_rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95qeth_rules/*.sh %dir %{dracutlibdir}/modules.d/95zfcp %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh %dir %{dracutlibdir}/modules.d/95zfcp_rules @@ -392,6 +388,9 @@ 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 +%dir %{dracutlibdir}/modules.d/99squash +%attr(755,root,root) %{dracutlibdir}/modules.d/99squash/*.sh +%{dracutlibdir}/modules.d/99squash/squash-mnt-clear.service %dir %{dracutlibdir}/modules.d/99uefi-lib %attr(755,root,root) %{dracutlibdir}/modules.d/99uefi-lib/*.sh %attr(755,root,root) %{dracutlibdir}/dracut-version.sh @@ -407,6 +406,7 @@ rm -rf $RPM_BUILD_ROOT %{_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* @@ -420,7 +420,6 @@ 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 @@ -429,8 +428,12 @@ rm -rf $RPM_BUILD_ROOT %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/35network-legacy +%{dracutlibdir}/modules.d/35network-legacy/dhclient.conf +%attr(755,root,root) %{dracutlibdir}/modules.d/35network-legacy/*.sh +%dir %{dracutlibdir}/modules.d/35network-manager +%attr(755,root,root) %{dracutlibdir}/modules.d/35network-manager/*.sh %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 @@ -463,11 +466,6 @@ rm -rf $RPM_BUILD_ROOT %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) -%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