From ea43bf85e2af6aa83b6451d7898cc9d5542fe3a1 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 2 May 2022 23:03:27 -0400 Subject: [PATCH] Use `make install` targets to install non-binary bits We want to use `%cargo_install` for the main binary to match the use of `%cargo_build`, but for everything else let's just use the same dependent make targets. --- rust-coreos-installer.spec | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index c739ca5..375fac0 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -124,16 +124,8 @@ install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer c %cargo_install -f rdcore # Install binaries, dracut modules, units, targets, generators for running via systemd install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/50rdcore dracut/50rdcore/module-setup.sh -install -D -m 0755 -t %{buildroot}%{_libexecdir} scripts/coreos-installer-service -install -D -m 0755 -t %{buildroot}%{_libexecdir} scripts/coreos-installer-disable-device-auto-activation -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-disable-device-auto-activation.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-reboot.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-noreboot.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-pre.target -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer.target -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-post.target -install -D -m 0755 -t %{buildroot}%{_systemdgeneratordir} systemd/coreos-installer-generator +make install-scripts DESTDIR=%{buildroot} +make install-systemd DESTDIR=%{buildroot} mv %{buildroot}%{_bindir}/rdcore %{buildroot}%{dracutlibdir}/modules.d/50rdcore/ %endif