From 4b2aed8d17debb84aa3783a65b692eb766c78ef1 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 7 May 2022 20:21:34 +0200 Subject: [PATCH] - up to 056, versioned Obsoletes --- arch-libdir.patch | 8 ++++---- dracut.spec | 19 +++++++++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/arch-libdir.patch b/arch-libdir.patch index 2e17908..86126db 100644 --- a/arch-libdir.patch +++ b/arch-libdir.patch @@ -1,10 +1,10 @@ ---- dracut-033/modules.d/95resume/module-setup.sh.orig 2013-09-15 18:27:32.700252837 +0200 -+++ dracut-033/modules.d/95resume/module-setup.sh 2013-09-15 18:30:44.410244789 +0200 -@@ -17,7 +17,7 @@ +--- dracut-056/modules.d/95resume/module-setup.sh.orig 2022-05-07 19:58:20.569138739 +0200 ++++ dracut-056/modules.d/95resume/module-setup.sh 2022-05-07 20:02:27.501134327 +0200 +@@ -50,7 +50,7 @@ install() { fi # Optional uswsusp support -- for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib/uswsusp/resume; do +- for _bin in /usr/sbin/resume /usr/lib/suspend/resume /usr/lib64/suspend/resume /usr/lib/uswsusp/resume /usr/lib64/uswsusp/resume; do + for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume /usr/@lib@/uswsusp/resume; do [[ -x $dracutsysrootdir${_bin} ]] && { inst "${_bin}" /usr/sbin/resume diff --git a/dracut.spec b/dracut.spec index 824aecb..445a20d 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,12 +1,12 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 055 -Release: 4 +Version: 056 +Release: 1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 0931ba8ed792600ce335adb0b064fa11 +# Source0-md5: 17d51f3ccc3a3a790bab6da0355ca4c2 Source1: pld.conf Patch0: plymouth-libdir.patch Patch1: os-release.patch @@ -124,7 +124,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 @@ -274,6 +274,8 @@ rm -rf $RPM_BUILD_ROOT %{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 @@ -291,6 +293,7 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -375,6 +378,14 @@ 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/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 -- 2.44.0