From 795d37b8c2a6ef0729fd011ee148222c9ae86eaa Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 1 Jun 2021 10:46:05 +0200 Subject: [PATCH] Rebase dracut to v55 Resolves: #1966446 --- .gitignore | 1 + dracut.spec | 42 +++++++++++++++++++++++++----------------- newdracut.sh | 0 sources | 2 +- 4 files changed, 27 insertions(+), 18 deletions(-) mode change 100644 => 100755 newdracut.sh diff --git a/.gitignore b/.gitignore index e27cb71..e93a36f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /dracut-050.tar.xz /dracut-051.tar.xz /dracut-053.tar.xz +/dracut-055.tar.xz diff --git a/dracut.spec b/dracut.spec index 45d0747..8589865 100644 --- a/dracut.spec +++ b/dracut.spec @@ -8,8 +8,8 @@ %define dist_free_release 1 Name: dracut -Version: 053 -Release: %{dist_free_release}%{?dist}.1 +Version: 055 +Release: %{dist_free_release}%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -21,7 +21,8 @@ Group: System/Base # The entire source code is GPLv2+ # except install/* which is LGPLv2+ -License: GPLv2+ and LGPLv2+ +# except util/* which is GPLv2 +License: GPLv2+ and LGPLv2+ and GPLv2 URL: https://dracut.wiki.kernel.org/ @@ -56,11 +57,6 @@ BuildRequires: docbook-xsl-stylesheets libxslt BuildRequires: asciidoc %endif -%if 0%{?suse_version} > 9999 -Obsoletes: mkinitrd < 2.6.1 -Provides: mkinitrd = 2.6.1 -%endif - Obsoletes: dracut-fips <= 047 Provides: dracut-fips = %{version}-%{release} Obsoletes: dracut-fips-aesni <= 047 @@ -265,9 +261,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man?/*suse* %endif %if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} <= 9999 -rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd -rm -f -- $RPM_BUILD_ROOT%{_mandir}/man8/mkinitrd.8* rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1* %endif @@ -276,7 +270,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %files %if %{with doc} -%doc README.md HACKING.md AUTHORS NEWS.md dracut.html dracut.png dracut.svg +%doc README.md docs/HACKING.md AUTHORS NEWS.md dracut.html docs/dracut.png docs/dracut.svg %endif %{!?_licensedir:%global license %%doc} %license COPYING lgpl-2.1.txt @@ -284,7 +278,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_datadir}/bash-completion/completions/dracut %{_datadir}/bash-completion/completions/lsinitrd %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 -%{_bindir}/mkinitrd %{_bindir}/lsinitrd %endif %dir %{dracutlibdir} @@ -296,6 +289,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/dracut-logger.sh %{dracutlibdir}/dracut-initramfs-restore %{dracutlibdir}/dracut-install +%{dracutlibdir}/dracut-util %{dracutlibdir}/skipcpio %config(noreplace) %{_sysconfdir}/dracut.conf %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} @@ -310,12 +304,8 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_mandir}/man8/dracut.8* %{_mandir}/man8/*service.8* %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} > 9999 -%{_mandir}/man8/mkinitrd.8* %{_mandir}/man1/lsinitrd.1* %endif -%if 0%{?suse_version} -%{_mandir}/man8/mkinitrd-suse.8* -%endif %{_mandir}/man7/dracut.kernel.7* %{_mandir}/man7/dracut.cmdline.7* %{_mandir}/man7/dracut.modules.7* @@ -327,19 +317,32 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %endif %{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00systemd +%{dracutlibdir}/modules.d/00systemd-network-management %ifnarch s390 s390x %{dracutlibdir}/modules.d/00warpclock %endif %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} %{dracutlibdir}/modules.d/01fips %endif +%{dracutlibdir}/modules.d/01systemd-ac-power %{dracutlibdir}/modules.d/01systemd-ask-password %{dracutlibdir}/modules.d/01systemd-coredump +%{dracutlibdir}/modules.d/01systemd-hostnamed %{dracutlibdir}/modules.d/01systemd-initrd +%{dracutlibdir}/modules.d/01systemd-journald +%{dracutlibdir}/modules.d/01systemd-ldconfig %{dracutlibdir}/modules.d/01systemd-modules-load %{dracutlibdir}/modules.d/01systemd-repart +%{dracutlibdir}/modules.d/01systemd-resolved +%{dracutlibdir}/modules.d/01systemd-rfkill +%{dracutlibdir}/modules.d/01systemd-sysext %{dracutlibdir}/modules.d/01systemd-sysctl %{dracutlibdir}/modules.d/01systemd-sysusers +%{dracutlibdir}/modules.d/01systemd-timedated +%{dracutlibdir}/modules.d/01systemd-timesyncd +%{dracutlibdir}/modules.d/01systemd-tmpfiles +%{dracutlibdir}/modules.d/01systemd-udevd +%{dracutlibdir}/modules.d/01systemd-veritysetup %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue %{dracutlibdir}/modules.d/04watchdog @@ -354,6 +357,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/45url-lib %{dracutlibdir}/modules.d/50drm %{dracutlibdir}/modules.d/50plymouth +%{dracutlibdir}/modules.d/62bluetooth %{dracutlibdir}/modules.d/80lvmmerge %{dracutlibdir}/modules.d/90btrfs %{dracutlibdir}/modules.d/90crypt @@ -369,6 +373,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop +%{dracutlibdir}/modules.d/91tpm2-tss %{dracutlibdir}/modules.d/95debug %{dracutlibdir}/modules.d/95fstab-sys %{dracutlibdir}/modules.d/95lunmask @@ -429,7 +434,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/50-dracut.install %files network -%{dracutlibdir}/modules.d/02systemd-networkd +%{dracutlibdir}/modules.d/01systemd-networkd %{dracutlibdir}/modules.d/35network-manager %{dracutlibdir}/modules.d/35network-legacy %{dracutlibdir}/modules.d/35network-wicked @@ -479,6 +484,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Tue Jun 01 2021 Lukas Nykryn - 055-1.1 +- rebase + * Thu Apr 15 2021 Mohan Boddu - 053-1.1 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/newdracut.sh b/newdracut.sh old mode 100644 new mode 100755 diff --git a/sources b/sources index e5f97ee..8958b33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dracut-053.tar.xz) = 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a +SHA512 (dracut-055.tar.xz) = 5d2450d0b08acb4cf4f927856fad5c243d1c8f04ac3a47e4d2c866d5d1a26a8121baaf604a21f7a18a36c01960c247689cf95317a90cb63be139a3a0a87a6a92