X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=aeac66f30840f196a99af1e37fe2ba26d0b834d5;hb=d29606462746e90a8f086a3002a054c86a6ace40;hp=8018a2113257545ce8ea463592e5ec1983e308ca;hpb=d072bfcb6d0f1021d8157270d40334fa58133508;p=packages%2Fdracut.git diff --git a/dracut.spec b/dracut.spec index 8018a21..aeac66f 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,20 +1,18 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 047 -Release: 3 +Version: 054 +Release: 1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 62d474ccb8411ec4a76ba5c79bc1093a +# Source0-md5: 3445436c128751a21cf88b0a18dc24a9 Source1: pld.conf 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 +Patch4: cryptsetup.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: asciidoc BuildRequires: dash @@ -23,6 +21,9 @@ BuildRequires: docbook-style-xsl BuildRequires: kmod-devel >= 23 BuildRequires: libxslt-progs BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 1.752 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz Requires: bash Requires: coreutils Requires: cpio @@ -122,6 +123,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 @@ -132,22 +134,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 @@ -184,6 +170,7 @@ Summary(pl.UTF-8): Bashowe dopełnianie składni dla polecenia dracut Group: Applications/Shells Requires: %{name} = %{version} Requires: bash-completion >= 2.0 +BuildArch: noarch %description -n bash-completion-dracut bash-completion for dracut. @@ -198,8 +185,6 @@ Bashowe dopełnianie składni dla polecenia dracut. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %{__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 @@ -217,7 +202,7 @@ find modules.d -name '*.orig' | xargs -r %{__rm} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \ +install -d $RPM_BUILD_ROOT{/boot/dracut,/sbin} \ $RPM_BUILD_ROOT/var/{log,lib/{dracut/overlay,initramfs}} %{__make} install \ @@ -225,35 +210,36 @@ install -d $RPM_BUILD_ROOT{/boot/dracut,/etc/logrotate.d,/sbin} \ 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 # create compat symlink ln -s %{_bindir}/dracut $RPM_BUILD_ROOT/sbin/dracut +# remove foreign arch modules +%ifnarch ppc ppc64 +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90ppcmac +%endif # 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 %files %defattr(644,root,root,755) -%doc AUTHORS HACKING NEWS README* TODO dracut.html dracut.png dracut.svg +%doc AUTHORS NEWS.md README.md docs/HACKING.md dracut.html docs/dracut.png docs/dracut.svg %dir %{_sysconfdir}/dracut.conf.d %config(noreplace) %{_sysconfdir}/dracut.conf %config(noreplace) %{_sysconfdir}/dracut.conf.d/01-dist.conf -%config(noreplace) /etc/logrotate.d/dracut_log # compat symlink %attr(755,root,root) /sbin/dracut %attr(755,root,root) %{_bindir}/dracut -%attr(755,root,root) %{_bindir}/mkinitrd %attr(755,root,root) %{_bindir}/lsinitrd %dir %{dracutlibdir} +%dir %{dracutlibdir}/dracut.conf.d %attr(755,root,root) %{dracutlibdir}/dracut-install +%attr(755,root,root) %{dracutlibdir}/dracut-util %dir %{dracutlibdir}/modules.d %attr(755,root,root) %{dracutlibdir}/dracut-functions.sh %attr(755,root,root) %{dracutlibdir}/dracut-functions @@ -262,22 +248,74 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/dracut-initramfs-restore %dir %{dracutlibdir}/modules.d/00bash %attr(755,root,root) %{dracutlibdir}/modules.d/00bash/module-setup.sh -%dir %{dracutlibdir}/modules.d/00bootchart -%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/00mksh +%attr(755,root,root) %{dracutlibdir}/modules.d/00mksh/module-setup.sh %dir %{dracutlibdir}/modules.d/00systemd %attr(755,root,root) %{dracutlibdir}/modules.d/00systemd/module-setup.sh +%dir %{dracutlibdir}/modules.d/00warpclock +%attr(755,root,root) %{dracutlibdir}/modules.d/00warpclock/*.sh +%dir %{dracutlibdir}/modules.d/01systemd-ac-power +%{dracutlibdir}/modules.d/01systemd-ac-power/99-initrd-power-targets.rules +%{dracutlibdir}/modules.d/01systemd-ac-power/initrd-on-ac-power.target +%{dracutlibdir}/modules.d/01systemd-ac-power/initrd-on-battery-power.target +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-ac-power/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-ask-password +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-ask-password/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-coredump +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-coredump/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-hostnamed +%{dracutlibdir}/modules.d/01systemd-hostnamed/99-systemd-networkd-dracut.conf +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-hostnamed/module-setup.sh +%{dracutlibdir}/modules.d/01systemd-hostnamed/org.freedesktop.hostname1_dracut.conf +%{dracutlibdir}/modules.d/01systemd-hostnamed/systemd-hostname-dracut.conf %dir %{dracutlibdir}/modules.d/01systemd-initrd %attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-initrd/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-journald +%{dracutlibdir}/modules.d/01systemd-journald/initrd.conf +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-journald/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-ldconfig +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-ldconfig/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-modules-load +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-modules-load/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-repart +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-repart/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-rfkill +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-rfkill/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-sysctl +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-sysctl/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-sysext +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-sysext/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-sysusers +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-sysusers/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-timedated +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-timedated/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-tmpfiles +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-tmpfiles/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-udevd +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-udevd/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-veritysetup +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-veritysetup/module-setup.sh %dir %{dracutlibdir}/modules.d/03modsign %attr(755,root,root) %{dracutlibdir}/modules.d/03modsign/*.sh %dir %{dracutlibdir}/modules.d/03rescue %attr(755,root,root) %{dracutlibdir}/modules.d/03rescue/module-setup.sh %dir %{dracutlibdir}/modules.d/04watchdog %attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog/*.sh +%dir %{dracutlibdir}/modules.d/04watchdog-modules +%attr(755,root,root) %{dracutlibdir}/modules.d/04watchdog-modules/module-setup.sh %dir %{dracutlibdir}/modules.d/05busybox %attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.sh +%dir %{dracutlibdir}/modules.d/06dbus-broker +%attr(755,root,root) %{dracutlibdir}/modules.d/06dbus-broker/module-setup.sh +%dir %{dracutlibdir}/modules.d/06dbus-daemon +%attr(755,root,root) %{dracutlibdir}/modules.d/06dbus-daemon/module-setup.sh +%dir %{dracutlibdir}/modules.d/06rngd +%attr(755,root,root) %{dracutlibdir}/modules.d/06rngd/module-setup.sh +%{dracutlibdir}/modules.d/06rngd/rngd.service +%dir %{dracutlibdir}/modules.d/09dbus +%attr(755,root,root) %{dracutlibdir}/modules.d/09dbus/module-setup.sh %dir %{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/10i18n/README %{dracutlibdir}/modules.d/10i18n/*.rules @@ -288,6 +326,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/50drm/module-setup.sh %dir %{dracutlibdir}/modules.d/50plymouth %attr(755,root,root) %{dracutlibdir}/modules.d/50plymouth/*.sh +%dir %{dracutlibdir}/modules.d/62bluetooth +%attr(755,root,root) %{dracutlibdir}/modules.d/62bluetooth/module-setup.sh %dir %{dracutlibdir}/modules.d/80cms %attr(755,root,root) %{dracutlibdir}/modules.d/80cms/*.sh %dir %{dracutlibdir}/modules.d/80lvmmerge @@ -313,6 +353,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,8 +364,8 @@ 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/90nvdimm +%attr(755,root,root) %{dracutlibdir}/modules.d/90nvdimm/module-setup.sh %dir %{dracutlibdir}/modules.d/90qemu %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh %dir %{dracutlibdir}/modules.d/91crypt-gpg @@ -331,6 +373,8 @@ rm -rf $RPM_BUILD_ROOT %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/91tpm2-tss +%attr(755,root,root) %{dracutlibdir}/modules.d/91tpm2-tss/module-setup.sh %dir %{dracutlibdir}/modules.d/91zipl %attr(755,root,root) %{dracutlibdir}/modules.d/91zipl/*.sh %dir %{dracutlibdir}/modules.d/95dcssblk @@ -353,6 +397,11 @@ 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/95nvmf +%attr(755,root,root) %{dracutlibdir}/modules.d/95nvmf/*.sh +%{dracutlibdir}/modules.d/95nvmf/95-nvmf-initqueue.rules +%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 @@ -398,8 +447,13 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/99fs-lib/*.sh %dir %{dracutlibdir}/modules.d/99img-lib %attr(755,root,root) %{dracutlibdir}/modules.d/99img-lib/*.sh +%dir %{dracutlibdir}/modules.d/99memstrack +%attr(755,root,root) %{dracutlibdir}/modules.d/99memstrack/*.sh +%{dracutlibdir}/modules.d/99memstrack/memstrack.service %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 %dir %{dracutlibdir}/modules.d/99uefi-lib %attr(755,root,root) %{dracutlibdir}/modules.d/99uefi-lib/*.sh %attr(755,root,root) %{dracutlibdir}/dracut-version.sh @@ -428,17 +482,33 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/dracut-pre-trigger.service.8* %{_mandir}/man8/dracut-pre-udev.service.8* %{_mandir}/man8/dracut-shutdown.service.8* -%{_mandir}/man8/mkinitrd.8* #/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/00systemd-network-management +%attr(755,root,root) %{dracutlibdir}/modules.d/00systemd-network-management/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-networkd +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-networkd/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-resolved +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-resolved/module-setup.sh +%{dracutlibdir}/modules.d/01systemd-resolved/resolved-tmpfile-dracut.conf +%dir %{dracutlibdir}/modules.d/01systemd-timesyncd +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-timesyncd/module-setup.sh +%{dracutlibdir}/modules.d/01systemd-timesyncd/timesyncd-tmpfile-dracut.conf +%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 +%{dracutlibdir}/modules.d/35network-manager/initrd-no-auto-default.conf +%{dracutlibdir}/modules.d/35network-manager/nm-initrd.service +%{dracutlibdir}/modules.d/35network-manager/nm-wait-online-initrd.service +%dir %{dracutlibdir}/modules.d/35network-wicked +%attr(755,root,root) %{dracutlibdir}/modules.d/35network-wicked/*.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 @@ -448,6 +518,10 @@ rm -rf $RPM_BUILD_ROOT %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 +%ifarch ppc ppc64 +%dir %{dracutlibdir}/modules.d/90ppcmac +%attr(755,root,root) %{dracutlibdir}/modules.d/90ppcmac/*.sh +%endif %dir %{dracutlibdir}/modules.d/90qemu-net %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu-net/*.sh %dir %{dracutlibdir}/modules.d/95cifs @@ -471,11 +545,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