import stratisd-2.4.2-2.el8

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/stratisd-2.3.0-vendor.tar.xz
+SOURCES/stratisd-2.4.2-vendor.tar.gz
-SOURCES/stratisd-2.3.0.tar.gz
+SOURCES/stratisd-2.4.2.tar.gz

.stratisd.metadata

@@ -1,2 +1,2 @@
-7de93a7f69039271c81a8be125a68adec2c5cef7 SOURCES/stratisd-2.3.0-vendor.tar.xz
+17524b817bc6fc65239fb11783cffe73d5796ca7 SOURCES/stratisd-2.4.2-vendor.tar.gz
-cdfbe45e7ce2bbaff2582f6a5db3780c626c00c5 SOURCES/stratisd-2.3.0.tar.gz
+be4920dd54a84a7f2656e62c743740b90692b68c SOURCES/stratisd-2.4.2.tar.gz

SPECS/stratisd.spec

@@ -3,16 +3,17 @@
 # A daemon that manages a pool of block devices to create flexible filesystems
 %global __cargo_is_lib() false
 %global udevdir %(pkg-config --variable=udevdir udev)
+%global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
-Version:        2.3.0
+Version:        2.4.2
 Release:        2%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 License:        MPLv2.0
 URL:            https://github.com/stratis-storage/stratisd
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-Source1:        %{name}-%{version}-vendor.tar.xz
+Source1:        %{url}/releases/download/v%{version}/%{name}-%{version}-vendor.tar.gz
 
 ExclusiveArch:  %{rust_arches}
 ExcludeArch:    i686
@@ -22,6 +23,7 @@ BuildRequires:  dbus-devel
 BuildRequires:  libblkid-devel
 BuildRequires:  cryptsetup-devel
 BuildRequires:  clang
+BuildRequires:  dracut
 BuildRequires:  %{_bindir}/a2x
 
 Requires:       xfsprogs
@@ -29,11 +31,29 @@ Requires:       device-mapper-persistent-data
 Requires:       systemd-libs
 Requires:       dbus-libs
 Requires:       cryptsetup >= 2.3.0
-Requires:       clevis-luks >= 15
+
+Recommends:     clevis-luks >= 15
 
 %description
 %{summary}.
 
+%package dracut
+
+
+Summary: Dracut modules for use with stratisd
+
+ExclusiveArch: ${rust_arches}
+
+Requires:     stratisd
+Requires:     dracut >= 049-136
+Requires:     plymouth
+
+%description dracut
+
+This package contains dracut modules to be used with stratisd
+to enable using Stratis filesystems as the root filesystem for
+a Linux install.
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -41,22 +61,43 @@ Requires:       clevis-luks >= 15
 %cargo_prep -V 1
 
 %build
-%cargo_build
+%cargo_build --bin=stratisd
+%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}
-mkdir -p %{buildroot}%{udevdir}
 mkdir -p %{buildroot}/developer_tools
-mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
+%{__install} -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd
-mv %{buildroot}%{_bindir}/stratis_uuids_to_names %{buildroot}%{udevdir}/stratis_uuids_to_names
 %{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8
-%{__install} -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/11-stratisd.rules
+%{__install} -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/61-stratisd.rules
-%{__install} -Dpm0644 -t %{buildroot}%{_unitdir} stratisd.service
+%{__install} -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratisd.service
-%{__install} -Dpm0755 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symlinks.sh
+%{__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
+%{__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
+
+mkdir -p %{buildroot}%{udevdir}
+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}
+ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/stratis-clevis-setup-generator
+ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/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
@@ -76,16 +117,56 @@ mv %{buildroot}%{_bindir}/stratis_uuids_to_names %{buildroot}%{udevdir}/stratis_
 %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
 %{_datadir}/dbus-1/system.d/stratisd.conf
 %{_mandir}/man8/stratisd.8*
 %{_unitdir}/stratisd.service
-%config %{_udevrulesdir}/11-stratisd.rules
+%config %{_udevrulesdir}/61-stratisd.rules
+%{udevdir}/stratis-str-cmp
+%{udevdir}/stratis-base32-decode
+%{_bindir}/stratis-predict-usage
+%{_unitdir}/stratisd-min-postinitrd.service
+%{_unitdir}/stratis-fstab-setup@.service
+%{_bindir}/stratis-min
+%{_libexecdir}/stratisd-min
+%{_usr}/lib/systemd/stratis-fstab-setup
+
+%files dracut
+%license LICENSE
+%{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
+%{_systemdgeneratordir}/stratis-clevis-setup-generator
+%{_systemdgeneratordir}/stratis-setup-generator
 
 %changelog
+* Fri Aug 20 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.2-2
+- Add stratisd to requires for stratisd-dracut
+- Resolves: rhbz#1995916
+
+* Wed Jun 02 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.2-1
+- Update to 2.4.2
+- Resolves: rhbz#1931671
+- Ensure that binaries are installed with proper features enabled
+- Split dracut modules out to subpackage
+- Add additional dependencies in dracut module
+
+* Wed May 12 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.0-3
+- Update to 2.4.0
+- Resolves: rhbz#1931671
+- Improve stratis by adding Multi-threading
+- Resolves: rhbz#1927485
+- Dump stratis configuration on demand or in debug
+- Resolves: rhbz#1735475
+- Add noalign option to XFS creation on MDV
+- Resolves: rhbz#1908318
+- Cap thinpool metadata device size at devicemapper-set limit
+- Resolves: rhbz#1707461
+
 * Tue Dec 08 2020  Dennis Keefe <dkeefe@redhat.com> - 2.3.0-2
 - Update to 2.3.0
 - Resolves: rhbz#1885328