From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 19 Mar 2025 13:08:49 +0000 (+0100)
Subject: fmf: Use mkosi -f together with ToolsTreePackageDirectories=
X-Git-Tag: v258-rc1~1040^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=314ea2ec7ba801adf3e25f29f12c426fda1f2b0e;p=thirdparty%2Fsystemd.git

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.
---

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 \