ci: use tools-tree=default for mkosi in all builds

Only s390x was using it so far.

Signed-off-by: Magnus Kulke <[email protected]>

.github/workflows/podvm_mkosi.yaml

@@ -114,14 +114,7 @@ jobs:
       - name: Install build dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y \
-            alien \
-            bubblewrap \
-            dnf \
-            mtools \
-            qemu-utils \
-            systemd-ukify \
-            uidmap
+          sudo apt-get install -y qemu-utils
           sudo snap install yq
 
       - name: Read properties from versions.yaml

src/cloud-api-adaptor/podvm-mkosi/mkosi.conf

@@ -8,3 +8,6 @@ OutputDirectory=build
 
 [Distribution]
 Distribution=fedora
+
+[Build]
+ToolsTree=default

src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/initrd/mkosi.conf

@@ -13,3 +13,6 @@ Packages=systemd
          util-linux
          kmod
          tpm2-tools
+
+[Host]
+ToolsTree=default

src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/initrd/mkosi.conf.d/fedora-s390x.conf

@@ -1,14 +1,6 @@
 [Match]
 Distribution=fedora
-
-# mkosi version in nix is 17.1,
-# which doesn't support Architecture in [Match]
-# As a workaround, use a flag file instead.
-#Architecture=s390x
-PathExists=../../resources/buildS390xImage
+Architecture=s390x
 
 [Content]
 Packages=kernel-core
-
-[Host]
-ToolsTree=default

src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf

@@ -15,3 +15,6 @@ Dependencies=initrd
 [Output]
 ManifestFormat=json
 Seed=0e9a6fe0-68f6-408c-bbeb-136054d20445
+
+[Host]
+ToolsTree=default

src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora-s390x.conf

@@ -10,6 +10,3 @@ Packages=s390utils
 
 [Output]
 Format=directory
-
-[Host]
-ToolsTree=default