diff --git a/.distro/dracut.spec b/.distro/dracut.spec index d5632a3f..67413630 100644 --- a/.distro/dracut.spec +++ b/.distro/dracut.spec @@ -6,12 +6,9 @@ # directory. %global __requires_exclude pkg-config -# rpmdev-bumpspec and releng automation compatible variable -%global baserelease 22 - Name: dracut -Version: 059 -Release: %{baserelease}%{?dist} +Version: 060 +Release: 1%{?dist} Summary: Initramfs generator using udev @@ -22,10 +19,19 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-only URL: https://github.com/dracutdevs/dracut/wiki/ -Source0: https://github.com/dracutdevs/dracut/archive/refs/tags/%{version}.tar.gz +# Currently upstream does not create releases, therefore +# source is created from commit 856e7acdb1462803c2517c8d64afb2e34c73c735 +# Reference PR: https://github.com/dracutdevs/dracut/pull/2509 +# Unpacked archive: https://github.com/pvalena/dracut-fedora/tree/v60-srpm-unpacked +Source0: dracut-%{version}.tar.xz +#Source0: https://github.com/dracutdevs/dracut/archive/refs/tags/%%{version}.tar.gz Source1: https://www.gnu.org/licenses/lgpl-2.1.txt +# Please use source-git to work with this spec file: +# HowTo: https://packit.dev/source-git/work-with-source-git +# Source-git repository: https://github.com/redhat-plumbers/dracut-fedora/ + BuildRequires: bash BuildRequires: git-core BuildRequires: pkgconfig(libkmod) >= 23 @@ -170,10 +176,6 @@ cp %{SOURCE1} . echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh -%if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0 -rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips -%endif - # we do not support dash in the initramfs rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash @@ -203,6 +205,7 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00warpclock mkdir -p $RPM_BUILD_ROOT/boot/dracut mkdir -p $RPM_BUILD_ROOT/var/lib/dracut/overlay mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log +touch $RPM_BUILD_ROOT%{_localstatedir}/log/dracut.log mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/initramfs install -m 0644 dracut.conf.d/fedora.conf.example $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/01-dist.conf @@ -259,6 +262,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/01systemd-ac-power %{dracutlibdir}/modules.d/01systemd-ask-password %{dracutlibdir}/modules.d/01systemd-coredump +%{dracutlibdir}/modules.d/01systemd-creds %{dracutlibdir}/modules.d/01systemd-hostnamed %{dracutlibdir}/modules.d/01systemd-initrd %{dracutlibdir}/modules.d/01systemd-integritysetup @@ -270,7 +274,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/01systemd-pstore %{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 @@ -353,6 +356,7 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/99memstrack %{dracutlibdir}/modules.d/99fs-lib %{dracutlibdir}/modules.d/99shutdown +%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_sharedstatedir}/initramfs %if %{defined _unitdir} %{_unitdir}/dracut-shutdown.service @@ -379,7 +383,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{dracutlibdir}/modules.d/01systemd-networkd %{dracutlibdir}/modules.d/35connman %{dracutlibdir}/modules.d/35network-manager -%{dracutlibdir}/modules.d/35network-wicked %{dracutlibdir}/modules.d/40network %{dracutlibdir}/modules.d/45ifcfg %{dracutlibdir}/modules.d/90kernel-network-modules @@ -428,6 +431,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Wed Mar 20 2024 Pavel Valena - 060-1 +- Update to dracut 060. + * Mon Feb 12 2024 Pavel Valena - 059-22 - Remove network-legacy module. diff --git a/.distro/source-git.yaml b/.distro/source-git.yaml index 14472e50..24917947 100644 --- a/.distro/source-git.yaml +++ b/.distro/source-git.yaml @@ -1,9 +1,10 @@ upstream_project_url: git@github.com:pvalena/dracut-fedora.git -upstream_ref: 856e7acdb1462803c2517c8d64afb2e34c73c735 +upstream_ref: 72a126415227cfcdf806c4d165d26983fe3b8b56 downstream_package_name: dracut specfile_path: .distro/dracut.spec patch_generation_ignore_paths: -- .distro +- .distro/ +- .packit.yml patch_generation_patch_id_digits: 1 sync_changelog: true files_to_sync: @@ -16,5 +17,5 @@ files_to_sync: - exclude source-git.yaml - exclude .gitignore sources: -- path: 059.tar.gz - url: https://src.fedoraproject.org/repo/pkgs/rpms/dracut/059.tar.gz/sha512/196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d/059.tar.gz +- path: dracut-060.tar.gz + url: https://src.fedoraproject.org/repo/pkgs/rpms/dracut/059.tar.gz/sha512/eca5b779307a86f1072201f576ebdd2187d0ae3603dfe009acb9ff6fff81f028c9b5b3d2fa70c723d138e00d40b1c0f97a8ae6cd1fcbeefc898d692c54db33e3/dracut-60.tar.gz