rpms/stratisd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Ensure that binaries are installed with proper features enabled

Browse Source
This commit is contained in:
John Baublitz 2021-05-13 19:18:59 -04:00
parent 4747cb7bb3
commit 7e4e7d4945
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
stratisd.spec
View File

@ -10,7 +10,7 @@
Name: stratisd Name: stratisd
Version: 2.4.0 Version: 2.4.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Daemon that manages block devices to create filesystems Summary: Daemon that manages block devices to create filesystems
# 0BSD or MIT or ASL 2.0 # 0BSD or MIT or ASL 2.0
@ -69,18 +69,15 @@ echo 'pkgconfig(blkid) >= 2.32.0'
%endif %endif
%build %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 %{__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 a2x -f manpage docs/stratisd.txt
%install %install
%cargo_install
install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf
# Daemon should be really private # Daemon should be really private
mkdir -p %{buildroot}%{_libexecdir} install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd
mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
install -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8 install -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8
install -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/61-stratisd.rules 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/stratisd-min-postinitrd.service
install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratis-fstab-setup\@.service install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratis-fstab-setup\@.service
mv %{buildroot}%{_bindir}/stratis-utils %{buildroot}%{udevdir}/stratis_utils cp target/release/stratis-utils target/release/stratis-str-cmp
mv %{buildroot}%{udevdir}/stratis_utils %{buildroot}%{udevdir}/stratis-str-cmp install -Dpm0755 -t %{buildroot}%{udevdir} target/release/stratis-str-cmp
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode 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 ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage
mkdir -p %{buildroot}%{_systemdgeneratordir} 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 %{_systemd_util_dir}/stratis-fstab-setup
%changelog %changelog
* Thu May 13 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.0-4
- Ensure that binaries are installed with proper features enabled
* Wed May 12 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.0-3 * Wed May 12 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.0-3
- Fix installed file paths - Fix installed file paths