From e122ec704584567259b2faf5bb7259766339debe Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 31 Mar 2021 15:20:36 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/dracut.git#0d91bfb921620b1ec8a17896bc2b8c23b81c5749 --- .gitignore | 1 + dracut.spec | 28 ++++++++++++++++------------ sources | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 10461e8..e27cb71 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /dracut-049.tar.xz /dracut-050.tar.xz /dracut-051.tar.xz +/dracut-053.tar.xz diff --git a/dracut.spec b/dracut.spec index e1b72e2..95c5f05 100644 --- a/dracut.spec +++ b/dracut.spec @@ -8,8 +8,8 @@ %define dist_free_release 1 Name: dracut -Version: 051 -Release: %{dist_free_release}%{?dist}.1 +Version: 053 +Release: %{dist_free_release}%{?dist} Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -32,7 +32,7 @@ Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar Source1: https://www.gnu.org/licenses/lgpl-2.1.txt BuildRequires: bash -BuildRequires: git +BuildRequires: git-core BuildRequires: pkgconfig(libkmod) >= 23 BuildRequires: gcc @@ -55,7 +55,6 @@ BuildRequires: docbook-xsl-stylesheets libxslt BuildRequires: asciidoc %endif -BuildRequires: make %if 0%{?suse_version} > 9999 Obsoletes: mkinitrd < 2.6.1 @@ -217,11 +216,6 @@ echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dr rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips %endif -%if %{defined _unitdir} -# for systemd, better use systemd-bootchart -rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00bootchart -%endif - # we do not support dash in the initramfs rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash @@ -282,7 +276,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %files %if %{with doc} -%doc README.md HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg +%doc README.md HACKING.md AUTHORS NEWS.md dracut.html dracut.png dracut.svg %endif %{!?_licensedir:%global license %%doc} %license COPYING lgpl-2.1.txt @@ -330,7 +324,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %endif %if %{undefined _unitdir} -%{dracutlibdir}/modules.d/00bootchart %endif %{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00systemd @@ -340,14 +333,22 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} %{dracutlibdir}/modules.d/01fips %endif +%{dracutlibdir}/modules.d/01systemd-ask-password +%{dracutlibdir}/modules.d/01systemd-coredump %{dracutlibdir}/modules.d/01systemd-initrd +%{dracutlibdir}/modules.d/01systemd-modules-load +%{dracutlibdir}/modules.d/01systemd-repart +%{dracutlibdir}/modules.d/01systemd-sysctl +%{dracutlibdir}/modules.d/01systemd-sysusers %{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03rescue %{dracutlibdir}/modules.d/04watchdog %{dracutlibdir}/modules.d/04watchdog-modules %{dracutlibdir}/modules.d/05busybox -%{dracutlibdir}/modules.d/06dbus +%{dracutlibdir}/modules.d/06dbus-broker +%{dracutlibdir}/modules.d/06dbus-daemon %{dracutlibdir}/modules.d/06rngd +%{dracutlibdir}/modules.d/09dbus %{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/30convertfs %{dracutlibdir}/modules.d/45url-lib @@ -478,6 +479,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Tue Feb 23 2021 Harald Hoyer - 053-1 +- version 053 + * Tue Jan 26 2021 Fedora Release Engineering - 051-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index ce77ba1..e5f97ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dracut-051.tar.xz) = f3533430e479bc91c538e0a198ca97450ec449a7d661d876ecd0ad3e417e22f7e4abf0a384fc676a63a4d3479f25d717c8acdcd1bdec7d0a5714298c5c4ea6b8 +SHA512 (dracut-053.tar.xz) = 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a