From 314ea2ec7ba801adf3e25f29f12c426fda1f2b0e Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 19 Mar 2025 14:08:49 +0100 Subject: [PATCH] fmf: Use mkosi -f together with ToolsTreePackageDirectories= There's no need to build various systemd tools from source again to build the mkosi image when we can just install the packages that were already built from source into the tools tree so let's do that to avoid unnecessary compiling. --- test/fmf/integration-tests/test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/fmf/integration-tests/test.sh b/test/fmf/integration-tests/test.sh index 582cc7d8653..447ab30bf92 100755 --- a/test/fmf/integration-tests/test.sh +++ b/test/fmf/integration-tests/test.sh @@ -57,6 +57,7 @@ SELinuxRelabel=yes [Build] ToolsTreeDistribution=${MKOSI_DISTRIBUTION:-$ID} ToolsTreeRelease=${MKOSI_RELEASE:-${VERSION_ID:-rawhide}} +ToolsTreePackageDirectories=.. Environment=NO_BUILD=1 WithTests=yes EOF @@ -90,7 +91,7 @@ mkosi summary mkosi -f sandbox -- true mkosi sandbox -- meson setup --buildtype=debugoptimized -Dintegration-tests=true build mkosi genkey -mkosi sandbox -- meson compile -C build mkosi +mkosi -f mkosi sandbox -- \ meson test \ -C build \ -- 2.47.3