From 029a3152a7da20b8ee4475fd756da03f69f10195 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 21 Feb 2023 10:01:35 -0500 Subject: [PATCH] Enable coreos-installer-dracut in Fedora Signed-off-by: Paul Whalen --- rust-coreos-installer.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index 834ad49..cc6f44c 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -12,7 +12,7 @@ Name: rust-%{crate} Version: 0.16.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -119,8 +119,6 @@ sed -i 's/"-Ccodegen-units=1",//' .cargo/config %install %if 0%{?rhel} && !0%{?eln} %make_install RELEASE=1 -# 51coreos-installer for coreos-installer-dracut -%make_install -C coreos-installer-dracut-%{dracutcommit} %else %cargo_install -f rdcore # Install binaries, dracut modules, units, targets, generators for running via systemd @@ -132,6 +130,9 @@ make install-data DESTDIR=%{buildroot} mv %{buildroot}%{_bindir}/rdcore %{buildroot}%{dracutlibdir}/modules.d/50rdcore/ %endif +# 51coreos-installer for coreos-installer-dracut +%make_install -C coreos-installer-dracut-%{dracutcommit} + %package -n %{crate}-bootinfra Summary: %{crate} boot-time infrastructure for use on Fedora/RHEL CoreOS Requires: %{crate}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -157,18 +158,16 @@ RHEL CoreOS. It is not needed on other platforms. %{_unitdir}/* %{_systemdgeneratordir}/* -%if 0%{?rhel} && !0%{?eln} %package -n %{crate}-dracut -Summary: Dracut module for running coreos-installer in the initrd +Summary: Dracut module for running coreos-installer in the initrd in IoT/Edge Requires: %{crate} = %{version}-%{release} %description -n %{crate}-dracut This subpackage contains files and configuration to run coreos-installer -from the initramfs. +from the initramfs in IoT/Edge and is supported by the community. %files -n %{crate}-dracut %{dracutlibdir}/modules.d/51coreos-installer -%endif %files -n %{crate} %license LICENSE @@ -188,6 +187,9 @@ from the initramfs. %endif %changelog +* Tue Feb 21 2023 Paul Whalen - 0.16.1-6 +- Enable coreos-installer-dracut in Fedora + * Fri Feb 17 2023 Jonathan Lebon - 0.16.1-5 - Backport patch that adds F39 signing key