From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 19 Dec 2024 10:41:40 +0000 (+0100)
Subject: mkosi: Use tools tree by default
X-Git-Tag: v258-rc1~1797^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1995084a9e01b53cf012a54fe69e35016c235151;p=thirdparty%2Fsystemd.git

mkosi: Use tools tree by default

Let's enable usage of a tools tree by default to simplify the setup
for new contributors and save them from having to install or upgrade
a bunch of extra tools to get mkosi working as expected.
---

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 01af0757227..4d90641d1a4 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -57,7 +57,6 @@ jobs:
           Distribution=arch
 
           [Build]
-          ToolsTree=default
           ToolsTreeDistribution=arch
           UseSubvolumes=yes
           WithTests=no
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index c9d4b012a2c..4d128822fbc 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -152,7 +152,6 @@ jobs:
 
           [Build]
           UseSubvolumes=yes
-          ToolsTree=default
           ToolsTreeDistribution=fedora
           ToolsTreeRelease=rawhide
 
diff --git a/mkosi.conf b/mkosi.conf
index 3da4e07a873..ab8a6a13724 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -29,6 +29,7 @@ RepartDirectories=mkosi.repart
 OutputDirectory=build/mkosi.output
 
 [Build]
+ToolsTree=default
 BuildDirectory=build/mkosi.builddir
 CacheDirectory=build/mkosi.cache
 BuildSourcesEphemeral=yes