From 4f07c7998daccc9ae836369cd72fef7dec8d64c8 Mon Sep 17 00:00:00 2001 From: mulhern Date: Wed, 28 Apr 2021 19:53:45 -0400 Subject: [PATCH] Fixes to previous release --- stratisd.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/stratisd.spec b/stratisd.spec index 3ae64ad..5592e87 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -61,7 +61,7 @@ Recommends: clevis-luks >= 18 %cargo_prep %generate_buildrequires -%cargo_generate_buildrequires +%cargo_generate_buildrequires -f dbus_enabled,min,systemd_compat echo '/usr/bin/a2x' echo 'pkgconfig(libcryptsetup) >= 2.3.0' echo 'pkgconfig(blkid) >= 2.32.0' @@ -69,7 +69,7 @@ echo 'pkgconfig(blkid) >= 2.32.0' %build %cargo_build -%cargo_build --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features min,systemd_compat +%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features min,systemd_compat a2x -f manpage docs/stratisd.txt %install @@ -93,6 +93,12 @@ install -Dpm0644 -t %{buildroot}%{dracutdir}/modules.d/90stratis dracut/90strati install -Dpm0644 -t %{buildroot}%{dracutdir}/modules.d/90stratis dracut/90stratis/61-stratisd.rules mkdir -p %{buildroot}%{dracutdir}/modules.d/90stratis-clevis +install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis-clevis dracut/90stratis-clevis/module-setup.sh +install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis-clevis dracut/90stratis-clevis/stratis-clevis-rootfs-setup + +install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratisd-min-postinitrd.service +install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratis-fstab-setup\@.service + mv %{buildroot}%{_bindir}/stratis-utils %{buildroot}%{udevdir}/stratis_utils mv %{buildroot}%{udevdir}/stratis_utils %{buildroot}%{udevdir}/stratis-str-cmp ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode @@ -129,7 +135,7 @@ install -Dpm0755 -t %{buildroot}%{_usr}/lib/systemd systemd/stratis-fstab-setup %{_datadir}/dbus-1/system.d/stratisd.conf %{_mandir}/man8/stratisd.8* %{_unitdir}/stratisd.service -%{_udevrulesdir}/11-stratisd.rules +%{_udevrulesdir}/61-stratisd.rules %{udevdir}/stratis-str-cmp %{udevdir}/stratis-base32-decode %{_bindir}/stratis-predict-usage @@ -149,6 +155,9 @@ install -Dpm0755 -t %{buildroot}%{_usr}/lib/systemd systemd/stratis-fstab-setup %{_usr}/lib/systemd/stratis-fstab-setup %changelog +* Tue Apr 27 2021 mulhern - 2.4.0-2 +- Fixes to previous release + * Tue Apr 27 2021 mulhern - 2.4.0-1 - Update to 2.4.0