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

Update to 2.4.0

Browse Source
This commit is contained in:
mulhern 2021-04-27 21:09:27 -04:00
parent 16beb07124
commit e3038109fe
3 changed files with 56 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -21,3 +21,5 @@
/stratisd-2.3.0.tar.gz
/stratisd-2.3.0-vendor.tar.xz
/stratisd-2.3.0-vendor.tar.gz
/stratisd-2.4.0.tar.gz
/stratisd-2.4.0-vendor.tar.gz

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (stratisd-2.3.0.tar.gz) = ec16c30394a40c091efbb90a85818a230e93ab615a7f9728cc873d7ca02e16579e7c696bb12295a9778ee6a5e6b95f4cf152853716d7f40985f124e3898977fc
SHA512 (stratisd-2.3.0-vendor.tar.gz) = e5386dbdfcf77bf219e67e92eb3f737925123b8d50710e610f192d78cebc26ff9bbec424141290543372de7c488d7e888c0f30cb4bb26dc4682ff999356465bb
SHA512 (stratisd-2.4.0.tar.gz) = 2ba76d06318967e43e8506dc01a4bb8ae67017f90b96c3d005177d036109e13fad141efd5f8d8be6ce6ed86ad8fa19924be3baf64b213e470ee35220ae70548a
SHA512 (stratisd-2.4.0-vendor.tar.gz) = 484cc19cabaaf5d33c4ff12b972c6007ec7a4c925eec56ca85d42fc18d8d29ba72ba307923872b7f97a45ec3f6870bf674529b1b778a08a30aa85475fb9c7c3a

65
stratisd.spec
View File

@ -2,14 +2,15 @@
%bcond_without check
%global __cargo_skip_build 0
%global udevdir %(pkg-config --variable=udevdir udev)
%global dracutdir %(pkg-config --variable=dracutdir dracut)
# Not interested in packaging lib
# stratisd is supposed to be daemon used through dbus
%global __cargo_is_lib() false
Name: stratisd
Version: 2.3.0
Release: 10%{?dist}
Version: 2.4.0
Release: 1%{?dist}
Summary: Daemon that manages block devices to create filesystems
# 0BSD or MIT or ASL 2.0
@ -44,7 +45,9 @@ BuildRequires: systemd
%{?systemd_requires}
Requires: xfsprogs
Requires: device-mapper-persistent-data
Requires: clevis-luks >= 15
Recommends: dracut >= 051
Recommends: clevis-luks >= 18
%description
%{summary}.
@ -66,23 +69,42 @@ 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
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
mkdir -p %{buildroot}%{udevdir}
mv %{buildroot}%{_bindir}/stratis_uuids_to_names %{buildroot}%{udevdir}/stratis_uuids_to_names
install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf
install -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8
install -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/11-stratisd.rules
install -Dpm0644 -t %{buildroot}%{_unitdir} stratisd.service
install -Dpm0755 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symlinks.sh
install -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/61-stratisd.rules
install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratisd.service
install -Dpm0644 -t %{buildroot}%{dracutdir}/dracut.conf.d dracut/90-stratis.conf
mkdir -p %{buildroot}%{dracutdir}/modules.d/90stratis
install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis dracut/90stratis/module-setup.sh
install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis dracut/90stratis/stratis-rootfs-setup
install -Dpm0644 -t %{buildroot}%{dracutdir}/modules.d/90stratis dracut/90stratis/stratisd-min.service
install -Dpm0644 -t %{buildroot}%{dracutdir}/modules.d/90stratis dracut/90stratis/61-stratisd.rules
mkdir -p %{buildroot}%{dracutdir}/modules.d/90stratis-clevis
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
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage
mkdir -p %{buildroot}%{_unitdir}/system-generators
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_unitdir}/system-generators/stratis-clevis-setup-generator
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_unitdir}/system-generators/stratis-setup-generator
install -Dpm0755 -t %{buildroot}%{_bindir} target/release/stratis-min
install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd-min
install -Dpm0755 -t %{buildroot}%{_usr}/lib/systemd systemd/stratis-fstab-setup
%if %{with check}
%check
@ -102,17 +124,34 @@ install -Dpm0755 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symli
%license LICENSE
%doc README.md
%{_libexecdir}/stratisd
%{udevdir}/stratis_uuids_to_names
%{_bindir}/stratis_dbusquery_version
%{_bindir}/stratis_migrate_symlinks.sh
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/system.d
%{_datadir}/dbus-1/system.d/stratisd.conf
%{_mandir}/man8/stratisd.8*
%{_unitdir}/stratisd.service
%{_udevrulesdir}/11-stratisd.rules
%{udevdir}/stratis-str-cmp
%{udevdir}/stratis-base32-decode
%{_bindir}/stratis-predict-usage
%{dracutdir}/dracut.conf.d/90-stratis.conf
%{dracutdir}/modules.d/90stratis-clevis/module-setup.sh
%{dracutdir}/modules.d/90stratis-clevis/stratis-clevis-rootfs-setup
%{dracutdir}/modules.d/90stratis/61-stratisd.rules
%{dracutdir}/modules.d/90stratis/module-setup.sh
%{dracutdir}/modules.d/90stratis/stratis-rootfs-setup
%{dracutdir}/modules.d/90stratis/stratisd-min.service
%{_unitdir}/stratisd-min-postinitrd.service
%{_unitdir}/stratis-fstab-setup@.service
%{_unitdir}/system-generators/stratis-clevis-setup-generator
%{_unitdir}/system-generators/stratis-setup-generator
%{_bindir}/stratis-min
%{_libexecdir}/stratisd-min
%{_usr}/lib/systemd/stratis-fstab-setup
%changelog
* Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-1
- Update to 2.4.0
* Wed Mar 17 2021 mulhern <amulhern@redhat.com> - 2.3.0-10
- Use external URL for vendored sources