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
This commit is contained in:
DistroBaker 2021-03-31 15:20:36 +00:00
parent 6b7bbe8d7e
commit e122ec7045
3 changed files with 18 additions and 13 deletions

1
.gitignore vendored
View File

@ -36,3 +36,4 @@
/dracut-049.tar.xz /dracut-049.tar.xz
/dracut-050.tar.xz /dracut-050.tar.xz
/dracut-051.tar.xz /dracut-051.tar.xz
/dracut-053.tar.xz

View File

@ -8,8 +8,8 @@
%define dist_free_release 1 %define dist_free_release 1
Name: dracut Name: dracut
Version: 051 Version: 053
Release: %{dist_free_release}%{?dist}.1 Release: %{dist_free_release}%{?dist}
Summary: Initramfs generator using udev Summary: Initramfs generator using udev
%if 0%{?fedora} || 0%{?rhel} %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 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
BuildRequires: bash BuildRequires: bash
BuildRequires: git BuildRequires: git-core
BuildRequires: pkgconfig(libkmod) >= 23 BuildRequires: pkgconfig(libkmod) >= 23
BuildRequires: gcc BuildRequires: gcc
@ -55,7 +55,6 @@ BuildRequires: docbook-xsl-stylesheets libxslt
BuildRequires: asciidoc BuildRequires: asciidoc
%endif %endif
BuildRequires: make
%if 0%{?suse_version} > 9999 %if 0%{?suse_version} > 9999
Obsoletes: mkinitrd < 2.6.1 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 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
%endif %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 # we do not support dash in the initramfs
rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash 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 %files
%if %{with doc} %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 %endif
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING lgpl-2.1.txt %license COPYING lgpl-2.1.txt
@ -330,7 +324,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
%endif %endif
%if %{undefined _unitdir} %if %{undefined _unitdir}
%{dracutlibdir}/modules.d/00bootchart
%endif %endif
%{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00bash
%{dracutlibdir}/modules.d/00systemd %{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} %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
%{dracutlibdir}/modules.d/01fips %{dracutlibdir}/modules.d/01fips
%endif %endif
%{dracutlibdir}/modules.d/01systemd-ask-password
%{dracutlibdir}/modules.d/01systemd-coredump
%{dracutlibdir}/modules.d/01systemd-initrd %{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/03modsign
%{dracutlibdir}/modules.d/03rescue %{dracutlibdir}/modules.d/03rescue
%{dracutlibdir}/modules.d/04watchdog %{dracutlibdir}/modules.d/04watchdog
%{dracutlibdir}/modules.d/04watchdog-modules %{dracutlibdir}/modules.d/04watchdog-modules
%{dracutlibdir}/modules.d/05busybox %{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/06rngd
%{dracutlibdir}/modules.d/09dbus
%{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/10i18n
%{dracutlibdir}/modules.d/30convertfs %{dracutlibdir}/modules.d/30convertfs
%{dracutlibdir}/modules.d/45url-lib %{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 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
%changelog %changelog
* Tue Feb 23 2021 Harald Hoyer <harald@redhat.com> - 053-1
- version 053
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 051-1.1 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 051-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (dracut-051.tar.xz) = f3533430e479bc91c538e0a198ca97450ec449a7d661d876ecd0ad3e417e22f7e4abf0a384fc676a63a4d3479f25d717c8acdcd1bdec7d0a5714298c5c4ea6b8 SHA512 (dracut-053.tar.xz) = 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a