From b3aac86badc4f82bc2664cce7b44ac29b9b7f2aa Mon Sep 17 00:00:00 2001 From: mulhern Date: Wed, 20 May 2026 12:38:33 -0400 Subject: [PATCH 1/2] Revert "Include dbus_enabled in features required by stratis-utils" This reverts commit 895d7a9f6c623b1ff9121dc94cb20ed86935d76b. It add dbus_enabled feature to several executables that are not stratis-utils. --- mockbuild_test/stratisd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockbuild_test/stratisd.spec b/mockbuild_test/stratisd.spec index bd6edff..79afcb9 100644 --- a/mockbuild_test/stratisd.spec +++ b/mockbuild_test/stratisd.spec @@ -98,7 +98,7 @@ Requires: stratisd %build %{cargo_license -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts} > LICENSE.dependencies %{__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 dbus_enabled,engine,min,systemd_compat +%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static %{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd-tools --no-default-features --features engine,extras From c6783391f6f95dac4c9ae5df967aa7bf23471ade Mon Sep 17 00:00:00 2001 From: mulhern Date: Wed, 20 May 2026 12:42:27 -0400 Subject: [PATCH 2/2] Include dbus_enabled in features required by stratis-utils Split the compilation of stratisd-min and stratis-min into a separate step. Signed-off-by: mulhern --- mockbuild_test/stratisd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mockbuild_test/stratisd.spec b/mockbuild_test/stratisd.spec index 79afcb9..05c8ec3 100644 --- a/mockbuild_test/stratisd.spec +++ b/mockbuild_test/stratisd.spec @@ -98,7 +98,8 @@ Requires: stratisd %build %{cargo_license -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts} > LICENSE.dependencies %{__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 engine,min,systemd_compat +%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min --no-default-features --features engine,min,systemd_compat +%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-utils --no-default-features --features dbus_enabled,engine,min,systemd_compat %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static %{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd-tools --no-default-features --features engine,extras