From 7e4e7d494527de1044aab5a73ceea6a91c7e3a6b Mon Sep 17 00:00:00 2001 From: John Baublitz Date: Thu, 13 May 2021 19:18:59 -0400 Subject: [PATCH] Ensure that binaries are installed with proper features enabled --- stratisd.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/stratisd.spec b/stratisd.spec index c4ce1a4..5d725c8 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -10,7 +10,7 @@ Name: stratisd Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Daemon that manages block devices to create filesystems # 0BSD or MIT or ASL 2.0 @@ -69,18 +69,15 @@ echo 'pkgconfig(blkid) >= 2.32.0' %endif %build -%cargo_build +%{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd %{__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 -%cargo_install - install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf # Daemon should be really private -mkdir -p %{buildroot}%{_libexecdir} -mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd +install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd install -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8 install -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/61-stratisd.rules @@ -100,9 +97,10 @@ install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis-clevis dracut/9 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 +cp target/release/stratis-utils target/release/stratis-str-cmp +install -Dpm0755 -t %{buildroot}%{udevdir} target/release/stratis-str-cmp ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode +mkdir -p %{buildroot}%{_bindir} ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage mkdir -p %{buildroot}%{_systemdgeneratordir} @@ -156,6 +154,9 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup %{_systemd_util_dir}/stratis-fstab-setup %changelog +* Thu May 13 2021 John Baublitz - 2.4.0-4 +- Ensure that binaries are installed with proper features enabled + * Wed May 12 2021 John Baublitz - 2.4.0-3 - Fix installed file paths