From bd37acfc84fb8b650a6ce3ed4c8ea5ac85358a3d Mon Sep 17 00:00:00 2001
From: Malte Poll <mp@edgeless.systems>
Date: Tue, 24 Jan 2023 12:05:46 +0100
Subject: [PATCH] ci: update mkosi to support systemd-repart

---
 .github/actions/setup_mkosi/action.yaml | 26 +++++++++++++++++--------
 .github/workflows/build-os-image.yml    |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/actions/setup_mkosi/action.yaml b/.github/actions/setup_mkosi/action.yaml
index 2737f6d69..5ec87291e 100644
--- a/.github/actions/setup_mkosi/action.yaml
+++ b/.github/actions/setup_mkosi/action.yaml
@@ -15,11 +15,13 @@ runs:
         sudo apt-get update
         sudo apt-get install --assume-yes --no-install-recommends \
           dnf \
-          systemd-container \
-          qemu-system-x86 \
-          ovmf \
           e2fsprogs \
-          squashfs-tools
+          libfdisk-dev \
+          mtools \
+          ovmf \
+          qemu-system-x86 \
+          squashfs-tools \
+          systemd-container
         echo "::endgroup::"
 
     # Try to eliminate "Failed to dissect image: Connection timed out" errors from nspawn by compiling
@@ -30,11 +32,19 @@ runs:
       run: |
         echo "::group::Update systemd-nspawn"
         sudo apt-get build-dep systemd
-        git clone https://github.com/systemd/systemd-stable --branch v251.2 --depth=1
-        meson systemd-stable/build systemd-stable
-        ninja -C systemd-stable/build systemd-nspawn
-        sudo ln -svf $PWD/systemd-stable/build/systemd-nspawn $(which systemd-nspawn)
+        git clone https://github.com/systemd/systemd --depth=1
+        meson systemd/build systemd -Drepart=true -Defi=true
+        ninja -C systemd/build systemd-nspawn systemd-dissect systemd-repart systemd-analyze bootctl ukify
+        sudo ln -svf $PWD/systemd/build/systemd-nspawn /usr/bin/systemd-nspawn
+        sudo ln -svf $PWD/systemd/build/systemd-dissect /usr/bin/systemd-dissect
+        sudo ln -svf $PWD/systemd/build/systemd-repart /usr/bin/systemd-repart
+        sudo ln -svf $PWD/systemd/build/systemd-analyze /usr/bin/systemd-analyze
+        sudo ln -svf $PWD/systemd/build/bootctl /usr/bin/bootctl
+        sudo ln -svf $PWD/systemd/build/ukify /usr/bin/ukify
         systemd-nspawn --version
+        systemd-dissect --version
+        systemd-repart --version
+        bootctl --version
         echo "::endgroup::"
 
     - name: Install
diff --git a/.github/workflows/build-os-image.yml b/.github/workflows/build-os-image.yml
index 0f9dd230d..39165758c 100644
--- a/.github/workflows/build-os-image.yml
+++ b/.github/workflows/build-os-image.yml
@@ -274,7 +274,7 @@ jobs:
       - name: Setup mkosi
         uses: ./.github/actions/setup_mkosi
         with:
-          version: 058046019e7ed2e8e93af87b8c14a808dcc6bbc3
+          version: b93e87a9dbbe30a79a42dfff9682a590f1052f53
 
       - name: Prepare PKI for secure boot signing
         id: prepare-pki