X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=dracut.spec;h=4d11db9510ecb8f0096ac41bd1407dc0c61a8998;hb=HEAD;hp=272be05fbec1c1706d06295d493136c398971b5f;hpb=29dde3a072d48be08723dfac978104d1a329c6ae;p=packages%2Fdracut.git diff --git a/dracut.spec b/dracut.spec index 272be05..1fea408 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,18 +1,19 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 050 +Version: 059 Release: 1 License: GPL v2+ Group: Base -Source0: https://git.kernel.org/pub/scm/boot/dracut/dracut.git/snapshot/%{name}-%{version}.tar.gz -# Source0-md5: 9df6a17bcbebb4296de9c68ea0a1c9c8 +Source0: https://github.com/dracutdevs/dracut/archive/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: bce69baf6f633ecf84dea7e3bb63dd32 Source1: pld.conf Patch0: plymouth-libdir.patch Patch1: os-release.patch Patch2: arch-libdir.patch Patch3: systemd-paths.patch Patch4: cryptsetup.patch +Patch5: bash.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: asciidoc BuildRequires: dash @@ -21,6 +22,8 @@ BuildRequires: docbook-style-xsl BuildRequires: kmod-devel >= 23 BuildRequires: libxslt-progs BuildRequires: pkgconfig +BuildRequires: rpm-build >= 4.6 +BuildRequires: rpmbuild(macros) >= 1.752 Requires: bash Requires: coreutils Requires: cpio @@ -120,7 +123,7 @@ Group: Base Requires: %{name} = %{version}-%{release} Requires: hmaccalc Requires: nss-softokn-freebl -Obsoletes: dracut-fips-aesni +Obsoletes: dracut-fips-aesni < 048 %description fips This package requires everything which is needed to build an all @@ -166,7 +169,8 @@ Summary: bash-completion for dracut Summary(pl.UTF-8): Bashowe dopełnianie składni dla polecenia dracut Group: Applications/Shells Requires: %{name} = %{version} -Requires: bash-completion >= 2.0 +Requires: bash-completion >= 1:2.0 +BuildArch: noarch %description -n bash-completion-dracut bash-completion for dracut. @@ -181,6 +185,7 @@ Bashowe dopełnianie składni dla polecenia dracut. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -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 @@ -198,7 +203,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 \ @@ -206,35 +211,37 @@ 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 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 foreign arch modules +%ifnarch ppc ppc64 +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/90ppcmac +%endif + +# modules used by dracut tests +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/80test{,-makeroot,-root} %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 @@ -243,8 +250,6 @@ 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 @@ -253,19 +258,75 @@ rm -rf $RPM_BUILD_ROOT %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-integritysetup +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-integritysetup/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-pcrphase +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-pcrphase/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-portabled +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-portabled/module-setup.sh +%dir %{dracutlibdir}/modules.d/01systemd-pstore +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-pstore/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 +%{dracutlibdir}/modules.d/01systemd-sysusers/sysusers-dracut.conf +%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 @@ -276,11 +337,16 @@ 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 %{dracutlibdir}/modules.d/80lvmmerge/README.md %attr(755,root,root) %{dracutlibdir}/modules.d/80lvmmerge/*.sh +%dir %{dracutlibdir}/modules.d/80lvmthinpool-monitor +%attr(755,root,root) %{dracutlibdir}/modules.d/80lvmthinpool-monitor/*.sh +%{dracutlibdir}/modules.d/80lvmthinpool-monitor/start-thinpool-monitor.service %dir %{dracutlibdir}/modules.d/81cio_ignore %attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh %dir %{dracutlibdir}/modules.d/90btrfs @@ -296,6 +362,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 +%dir %{dracutlibdir}/modules.d/90dmsquash-live-autooverlay +%attr(755,root,root) %{dracutlibdir}/modules.d/90dmsquash-live-autooverlay/*.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 @@ -312,16 +380,27 @@ 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/90nvdimm +%attr(755,root,root) %{dracutlibdir}/modules.d/90nvdimm/module-setup.sh +%dir %{dracutlibdir}/modules.d/90overlayfs +%attr(755,root,root) %{dracutlibdir}/modules.d/90overlayfs/*.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/91fido2 +%attr(755,root,root) %{dracutlibdir}/modules.d/91fido2/module-setup.sh +%dir %{dracutlibdir}/modules.d/91pcsc +%attr(755,root,root) %{dracutlibdir}/modules.d/91pcsc/module-setup.sh +%{dracutlibdir}/modules.d/91pcsc/pcscd.service +%{dracutlibdir}/modules.d/91pcsc/pcscd.socket +%dir %{dracutlibdir}/modules.d/91pkcs11 +%attr(755,root,root) %{dracutlibdir}/modules.d/91pkcs11/module-setup.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 @@ -344,8 +423,13 @@ 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/95virtiofs +%attr(755,root,root) %{dracutlibdir}/modules.d/95virtiofs/*.sh %dir %{dracutlibdir}/modules.d/95zfcp %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh %dir %{dracutlibdir}/modules.d/95zfcp_rules @@ -391,11 +475,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 -%{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 @@ -424,20 +510,36 @@ 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/35connman +%attr(755,root,root) %{dracutlibdir}/modules.d/35connman/*.sh +%{dracutlibdir}/modules.d/35connman/cm-initrd.service +%{dracutlibdir}/modules.d/35connman/cm-wait-online-initrd.service %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 %attr(755,root,root) %{dracutlibdir}/modules.d/40network/*.sh %dir %{dracutlibdir}/modules.d/45ifcfg @@ -448,6 +550,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