Fixes to previous release
This commit is contained in:
parent
e3038109fe
commit
4f07c7998d
@ -61,7 +61,7 @@ Recommends: clevis-luks >= 18
|
|||||||
%cargo_prep
|
%cargo_prep
|
||||||
|
|
||||||
%generate_buildrequires
|
%generate_buildrequires
|
||||||
%cargo_generate_buildrequires
|
%cargo_generate_buildrequires -f dbus_enabled,min,systemd_compat
|
||||||
echo '/usr/bin/a2x'
|
echo '/usr/bin/a2x'
|
||||||
echo 'pkgconfig(libcryptsetup) >= 2.3.0'
|
echo 'pkgconfig(libcryptsetup) >= 2.3.0'
|
||||||
echo 'pkgconfig(blkid) >= 2.32.0'
|
echo 'pkgconfig(blkid) >= 2.32.0'
|
||||||
@ -69,7 +69,7 @@ echo 'pkgconfig(blkid) >= 2.32.0'
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%cargo_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
|
a2x -f manpage docs/stratisd.txt
|
||||||
|
|
||||||
%install
|
%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
|
install -Dpm0644 -t %{buildroot}%{dracutdir}/modules.d/90stratis dracut/90stratis/61-stratisd.rules
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{dracutdir}/modules.d/90stratis-clevis
|
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}%{_bindir}/stratis-utils %{buildroot}%{udevdir}/stratis_utils
|
||||||
mv %{buildroot}%{udevdir}/stratis_utils %{buildroot}%{udevdir}/stratis-str-cmp
|
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}%{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
|
%{_datadir}/dbus-1/system.d/stratisd.conf
|
||||||
%{_mandir}/man8/stratisd.8*
|
%{_mandir}/man8/stratisd.8*
|
||||||
%{_unitdir}/stratisd.service
|
%{_unitdir}/stratisd.service
|
||||||
%{_udevrulesdir}/11-stratisd.rules
|
%{_udevrulesdir}/61-stratisd.rules
|
||||||
%{udevdir}/stratis-str-cmp
|
%{udevdir}/stratis-str-cmp
|
||||||
%{udevdir}/stratis-base32-decode
|
%{udevdir}/stratis-base32-decode
|
||||||
%{_bindir}/stratis-predict-usage
|
%{_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
|
%{_usr}/lib/systemd/stratis-fstab-setup
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-2
|
||||||
|
- Fixes to previous release
|
||||||
|
|
||||||
* Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-1
|
* Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-1
|
||||||
- Update to 2.4.0
|
- Update to 2.4.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user