X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=1339f8c22ee4699300178f0529b973462eae1aa6;hb=HEAD;hp=4102de8f5d4ea154d5576df79038bdcd89025bf9;hpb=21e788497e4b3a67fdb3fe2a5dffcdf3eebd44de;p=packages%2Fdracut.git diff --git a/dracut.spec b/dracut.spec index 4102de8..72ffee6 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,24 +1,26 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 047 +Version: 059 Release: 2 License: GPL v2+ Group: Base -Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 62d474ccb8411ec4a76ba5c79bc1093a +Source0: https://github.com/dracutdevs/dracut/archive/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: bce69baf6f633ecf84dea7e3bb63dd32 Source1: tld.conf Source2: update-initramfs Patch1: os-release.patch Patch2: arch-libdir.patch -Patch3: prelink-libs.patch -Patch4: config.patch -Patch5: compressors.patch -Patch6: proc_sys_remount.patch -Patch7: misc_fixes.patch -Patch8: initrd-release.patch -Patch9: no_systemd_udevd.patch -URL: https://dracut.wiki.kernel.org/ +Patch3: config.patch +Patch4: compressors.patch +Patch5: proc_sys_remount.patch +Patch6: misc_fixes.patch +Patch7: initrd-release.patch +Patch8: crypttab-keyscript.patch +Patch9: bash.patch +Patch10: microcode-check.patch +Patch100: no_systemd.patch +URL: https://github.com/dracutdevs/dracut/wiki/ BuildRequires: asciidoc BuildRequires: dash BuildRequires: docbook-dtd45-xml @@ -26,6 +28,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: bzip2 Requires: coreutils @@ -62,7 +66,6 @@ Suggests: losetup Suggests: lvm2 Suggests: mdadm Suggests: multipath-tools -Suggests: plymouth Suggests: suspend-utils Suggests: syslogdaemon Suggests: xfsprogs @@ -97,12 +100,12 @@ Requires: bridge-utils Requires: dhcp-client Requires: iproute2 Requires: iputils-arping -Requires: ping Requires: nbd Requires: net-tools Requires: nfs-utils-clients Requires: open-iscsi Requires: openssh-clients +Requires: ping Requires: rpcbind Suggests: curl @@ -122,6 +125,7 @@ Group: Base Requires: %{name} = %{version}-%{release} Requires: hmaccalc Requires: nss-softokn-freebl +Obsoletes: dracut-fips-aesni < 048 %description fips This package requires everything which is needed to build an all @@ -132,22 +136,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 @@ -183,7 +171,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. @@ -197,12 +186,14 @@ Bashowe dopełnianie składni dla polecenia dracut. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch100 -p1 -%{__sed} -i -e 's,@lib@,%{_lib},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} @@ -217,7 +208,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 \ @@ -226,42 +217,50 @@ 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 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-initramfs 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 -# 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 systemd stuff -%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd,01systemd-initrd,02systemd-networkd,98dracut-systemd} -%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90multipath/multipathd,90dmsquash-live/checkisomd5@}.service +# 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} + +# remove systemd and related stuff +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{00systemd*,01systemd*,98dracut-systemd} +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{35connman,35network-manager,35network-wicked} +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{06dbus-broker,06dbus-daemon,06rngd,09dbus} +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{50plymouth,62bluetooth,80lvmmerge,80lvmthinpool-monitor} +%{__rm} -r $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{91fido2,91pcsc,91pkcs11,91tpm2-tss,99memstrack} +%{__rm} $RPM_BUILD_ROOT%{dracutlibdir}/modules.d/{90dmsquash-live/checkisomd5@.service,90multipath/multipathd{,-configure}.service} %{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/dracut-*.service.8 +# remove unneded files +%{__rm} -r $RPM_BUILD_ROOT/usr/lib/kernel/install.d/*.install + %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 %attr(755,root,root) %{_bindir}/update-initramfs %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 @@ -270,16 +269,20 @@ 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/00warpclock +%attr(755,root,root) %{dracutlibdir}/modules.d/00warpclock/*.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/10i18n @@ -290,13 +293,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/30convertfs/*.sh %dir %{dracutlibdir}/modules.d/50drm %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/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/81cio_ignore %attr(755,root,root) %{dracutlibdir}/modules.d/81cio_ignore/*.sh %dir %{dracutlibdir}/modules.d/90btrfs @@ -312,10 +310,14 @@ 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 %dir %{dracutlibdir}/modules.d/90dmsquash-live-ntfs %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 @@ -324,8 +326,10 @@ 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/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/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/91crypt-gpg @@ -355,6 +359,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 @@ -397,6 +408,8 @@ 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 %dir %{dracutlibdir}/modules.d/99uefi-lib %attr(755,root,root) %{dracutlibdir}/modules.d/99uefi-lib/*.sh %attr(755,root,root) %{dracutlibdir}/dracut-version.sh @@ -413,15 +426,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man7/dracut.kernel.7* %{_mandir}/man7/dracut.modules.7* %{_mandir}/man8/dracut.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/35network-legacy +%{dracutlibdir}/modules.d/35network-legacy/dhclient.conf +%attr(755,root,root) %{dracutlibdir}/modules.d/35network-legacy/*.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 @@ -431,6 +445,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 @@ -454,11 +472,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