mkosi: Use mkosi.tools.conf for tools tree configuration

This allows us to use the regular settings instead of having to bother
with ToolsTreeXXX variants. It'll also allow us to share configuration
between the regular images and the tools tree image, which we'll make
use of in the next commit.

mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf

@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=|fedora
-ToolsTreeDistribution=|centos
-
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
-ToolsTreePackages=
-        python3-mypy
-        rpm-build

mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf

@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=|debian
-ToolsTreeDistribution=|ubuntu
-
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
-ToolsTreePackages=
-        gh
-        lcov
-        mypy
-        shellcheck

mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf

@@ -7,4 +7,4 @@ Architecture=!x86
 Release=noble
 
 [Build]
-SandboxTrees=noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources

mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf

@@ -7,4 +7,4 @@ Architecture=|x86
 Release=noble
 
 [Build]
-SandboxTrees=noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources

mkosi.tools.conf/mkosi.conf

@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Build]
-ToolsTreeSyncScripts=%D/mkosi.sync
-ToolsTreePackages=
+[Content]
+SyncScripts=%D/mkosi.sync
+Packages=
         gdb
         llvm
         meson # Also needed in the NO_BUILD case so we list it explicitly.

mkosi.tools.conf/mkosi.conf.d/arch.conf

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-ToolsTreeDistribution=arch
+Distribution=arch
 
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
-ToolsTreePackages=
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare
+Packages=
         base-devel
         github-cli
         lcov

mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|fedora
+Distribution=|centos
+
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare
+Packages=
+        python3-mypy
+        rpm-build

mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|debian
+Distribution=|ubuntu
+
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare
+Packages=
+        gh
+        lcov
+        mypy
+        shellcheck

mkosi.tools.conf/mkosi.conf.d/fedora.conf

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-ToolsTreeDistribution=fedora
+Distribution=fedora
 
-[Build]
-ToolsTreePackages=
+[Content]
+Packages=
         lcov
         gh
         ruff

mkosi.tools.conf/mkosi.conf.d/opensuse.conf

@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-ToolsTreeDistribution=opensuse
+Distribution=opensuse
 
-[Build]
-ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
-ToolsTreePackages=
+[Content]
+PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare
+Packages=
         gh
         lcov
         mypy

mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-ToolsTreeDistribution=ubuntu
+Distribution=ubuntu

mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf

@@ -4,7 +4,7 @@
 [Match]
 Architecture=!x86-64
 Architecture=!x86
-ToolsTreeRelease=noble
+Release=noble
 
 [Build]
-ToolsTreeSandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources

mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf

@@ -4,7 +4,7 @@
 [Match]
 Architecture=|x86-64
 Architecture=|x86
-ToolsTreeRelease=noble
+Release=noble
 
 [Build]
-ToolsTreeSandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
+SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources

test/integration-tests/README.md

@@ -169,9 +169,9 @@ ToolsTree=
 
 On the other hand, if the rpms are available but not installed on the host
 system, you'll want to make sure they're installed into the mkosi tools tree so
-that they're used to build the image by using either
-`ToolsTreePackageDirectories=` or `ToolsTreeSandboxTrees=` similarly to
-`PackageDirectories=` or `SandboxTrees=` mentioned above.
+that they're used to build the image by again using either
+`PackageDirectories=` or `SandboxTrees=`, but this time in
+`mkosi.tools.conf/mkosi.local.conf` instead of `mkosi.local.conf`.
 
 Finally, we'll make use of the standalone mode of running the integration tests
 to avoid having to install any build dependencies.