From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 7 Jun 2024 16:54:17 +0000 (+0200)
Subject: mkosi: Stop using tools tree
X-Git-Tag: v256~18^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F33241%2Fhead;p=thirdparty%2Fsystemd.git

mkosi: Stop using tools tree

Noble has all the tooling we need so let's stop using a tools tree
and just install the dependencies we need on the host system.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 40fc167195f..71037f8fac0 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -140,8 +140,6 @@ jobs:
                 LLVM=${{ matrix.llvm }}
 
         [Host]
-        ToolsTree=default
-        ToolsTreeDistribution=fedora
         QemuMem=4G
         # We build with debuginfo so there's no point in mounting the sources into the machine.
         RuntimeBuildSources=no
@@ -153,24 +151,20 @@ jobs:
     - name: Show image summary
       run: mkosi summary
 
-    - name: Install build dependencies
+    - name: Install dependencies
       run: |
-        sudo apt-get install \
-            meson \
+        mkosi dependencies |
+        xargs -d '\n' sudo apt-get install \
             gperf \
-            libfdisk-dev \
-            libmount-dev \
-            libtss2-dev \
             libblkid-dev \
-            libmicrohttpd-dev \
             libcap-dev \
-            libcurl4-openssl-dev \
             libcryptsetup-dev \
-            erofs-utils \
-            dosfstools \
-            python3-pefile \
-            sbsigntool \
-            mtools
+            libcurl4-openssl-dev \
+            libfdisk-dev \
+            libmicrohttpd-dev \
+            libmount-dev \
+            libtss2-dev \
+            meson
 
     - name: Configure meson
       run: |
@@ -183,7 +177,7 @@ jobs:
             -Dtpm2=enabled \
             -Dlibcryptsetup=enabled \
             -Dlibcurl=enabled \
-            -Drepart=disabled \
+            -Drepart=enabled \
             -Dfirstboot=true \
             -Dsysusers=true \
             -Dtmpfiles=true \