]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fmf: Use mkosi -f together with ToolsTreePackageDirectories= 36794/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 19 Mar 2025 13:08:49 +0000 (14:08 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 20 Mar 2025 08:24:07 +0000 (09:24 +0100)
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

index 582cc7d8653846f1f556334ddd451409c43c7591..447ab30bf9216f36648df2c7198ac3ec848a6d61 100755 (executable)
@@ -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 \