X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=dracut.spec;h=bf875c4a3e4d56ddc1bbc5bd7d14f6becdd8a3a3;hb=17be4dcdf9b5d4871631f9863451ba17838ee3cd;hp=ddb83049304542e162e817b94d0d9bbd4617c847;hpb=8a8d7eece41da2edfcc70333aceb87a4a8d6c5d8;p=packages%2Fdracut.git diff --git a/dracut.spec b/dracut.spec index ddb8304..bf875c4 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,23 +1,26 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 023 -Release: 3 +Version: 050 +Release: 2 License: GPL v2+ Group: Base -Source0: ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 7ae42fa8272363400ee6161c47d1beb5 +Source0: https://git.kernel.org/pub/scm/boot/dracut/dracut.git/snapshot/%{name}-%{version}.tar.gz +# Source0-md5: 9df6a17bcbebb4296de9c68ea0a1c9c8 Source1: pld.conf -Patch0: no-rh.patch -Patch1: bash-sh.patch -Patch2: plymouth-libexec.patch -Patch4: os-release.patch -Patch5: plymouth-logo.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 >= 23 BuildRequires: libxslt-progs +BuildRequires: pkgconfig Requires: bash Requires: coreutils Requires: cpio @@ -27,10 +30,11 @@ Requires: glibc-misc Requires: grep Requires: gzip Requires: hardlink +Requires: kmod >= 23 Requires: sed Requires: systemd-units Requires: udev -Requires: util-linux >= 2.20 +Requires: util-linux >= 2.22.2-3 Requires: vim-rt Requires: vim-static Requires: virtual(module-tools) @@ -59,6 +63,8 @@ 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) %define dracutlibdir %{_prefix}/lib/dracut @@ -89,12 +95,12 @@ Requires: bridge-utils Requires: dhcp-client Requires: iproute2 Requires: iputils-arping -Requires: iputils-ping Requires: nbd Requires: net-tools Requires: nfs-utils-clients Requires: open-iscsi Requires: openssh-clients +Requires: ping Requires: rpcbind Suggests: curl @@ -114,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 @@ -124,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 @@ -170,18 +161,37 @@ configuration. Ten pakiet zawiera narzędzia do łączenia lokalnych initrd oraz konfiguracji maszyn. +%package -n bash-completion-dracut +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 + +%description -n bash-completion-dracut +bash-completion for dracut. + +%description -n bash-completion-dracut -l pl.UTF-8 +Bashowe dopełnianie składni dla polecenia dracut. + %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 -%patch5 -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} %build +# not autoconf generated +./configure \ + --sysconfdir=%{_sysconfdir} \ + --systemdsystemunitdir=%{systemdunitdir} + %{__make} all doc \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" @@ -192,29 +202,32 @@ 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 \ - libdir=%{_prefix}/lib \ - bindir=%{_bindir} \ - systemdsystemunitdir=%{systemdunitdir} \ - sysconfdir=%{_sysconfdir} \ - mandir=%{_mandir} + DESTDIR=$RPM_BUILD_ROOT 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 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 @@ -225,39 +238,61 @@ rm -rf $RPM_BUILD_ROOT %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 %dir %{dracutlibdir}/modules.d %attr(755,root,root) %{dracutlibdir}/dracut-functions.sh %attr(755,root,root) %{dracutlibdir}/dracut-functions +%attr(755,root,root) %{dracutlibdir}/dracut-init.sh %attr(755,root,root) %{dracutlibdir}/dracut-logger.sh %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/01bash -%attr(755,root,root) %{dracutlibdir}/modules.d/01bash/*.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-initrd +%attr(755,root,root) %{dracutlibdir}/modules.d/01systemd-initrd/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/05busybox %attr(755,root,root) %{dracutlibdir}/modules.d/05busybox/*.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/10i18n %{dracutlibdir}/modules.d/10i18n/README %{dracutlibdir}/modules.d/10i18n/*.rules %attr(755,root,root) %{dracutlibdir}/modules.d/10i18n/*.sh %dir %{dracutlibdir}/modules.d/30convertfs %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 %{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 @@ -266,8 +301,13 @@ 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 +%{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 %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 @@ -275,13 +315,26 @@ rm -rf $RPM_BUILD_ROOT %{dracutlibdir}/modules.d/90mdraid/*.rules %attr(755,root,root) %{dracutlibdir}/modules.d/90mdraid/*.sh %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/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 @@ -290,11 +343,18 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/95dasd/*.sh %dir %{dracutlibdir}/modules.d/95dasd_mod %attr(755,root,root) %{dracutlibdir}/modules.d/95dasd_mod/*.sh +%dir %{dracutlibdir}/modules.d/95dasd_rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95dasd_rules/*.sh +%dir %{dracutlibdir}/modules.d/95fcoe-uefi +%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 -%{dracutlibdir}/modules.d/95zfcp/*.rules %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh +%dir %{dracutlibdir}/modules.d/95zfcp_rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp_rules/*.sh %dir %{dracutlibdir}/modules.d/95terminfo %attr(755,root,root) %{dracutlibdir}/modules.d/95terminfo/*.sh %dir %{dracutlibdir}/modules.d/95udev-rules @@ -323,11 +383,11 @@ rm -rf $RPM_BUILD_ROOT %{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/98dracut-systemd +%{dracutlibdir}/modules.d/98dracut-systemd/dracut-tmpfiles.conf +%{dracutlibdir}/modules.d/98dracut-systemd/*.service +%attr(755,root,root) %{dracutlibdir}/modules.d/98dracut-systemd/*.sh +%doc %{dracutlibdir}/modules.d/98dracut-systemd/*.8* %dir %{dracutlibdir}/modules.d/98usrmount %attr(755,root,root) %{dracutlibdir}/modules.d/98usrmount/*.sh %dir %{dracutlibdir}/modules.d/99base @@ -338,36 +398,65 @@ 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 +%attr(755,root,root) %{dracutlibdir}/skipcpio %dir /var/lib/initramfs -%{systemdunitdir}/*.service -%{systemdunitdir}/*/*.service + +%{systemdunitdir}/dracut-*.service +%{systemdunitdir}/initrd.target.wants/dracut-*.service +%{systemdunitdir}/sysinit.target.wants/dracut-shutdown.service + +%{_npkgconfigdir}/dracut.pc + %{_mandir}/man1/lsinitrd.1* %{_mandir}/man5/dracut.conf.5* -%{_mandir}/man7/dracut.kernel.7* +%{_mandir}/man7/dracut.bootup.7* %{_mandir}/man7/dracut.cmdline.7* +%{_mandir}/man7/dracut.kernel.7* +%{_mandir}/man7/dracut.modules.7* %{_mandir}/man8/dracut.8* %{_mandir}/man8/dracut-cmdline.service.8* %{_mandir}/man8/dracut-initqueue.service.8* +%{_mandir}/man8/dracut-mount.service.8* +%{_mandir}/man8/dracut-pre-mount.service.8* %{_mandir}/man8/dracut-pre-pivot.service.8* %{_mandir}/man8/dracut-pre-trigger.service.8* %{_mandir}/man8/dracut-pre-udev.service.8* -%{_mandir}/man8/initrd-switch-root.service.8* +%{_mandir}/man8/dracut-shutdown.service.8* %{_mandir}/man8/mkinitrd.8* -%{_mandir}/man8/udevadm-cleanup-db.service.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/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 %dir %{dracutlibdir}/modules.d/45url-lib %attr(755,root,root) %{dracutlibdir}/modules.d/45url-lib/*.sh +%dir %{dracutlibdir}/modules.d/90kernel-network-modules +%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 @@ -391,11 +480,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 @@ -409,3 +493,8 @@ rm -rf $RPM_BUILD_ROOT %dir /boot/dracut %dir /var/lib/dracut %dir /var/lib/dracut/overlay + +%files -n bash-completion-dracut +%defattr(644,root,root,755) +%{_datadir}/bash-completion/completions/dracut +%{_datadir}/bash-completion/completions/lsinitrd