From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 15 Dec 2022 12:52:52 +0000 (+0100)
Subject: mkosi: work around a file conflict between systemd and systemd-boot
X-Git-Tag: v253-rc1~267
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a32831ae1dd9f5e1f34537c27f4c67b3125acb0b;p=thirdparty%2Fsystemd.git

mkosi: work around a file conflict between systemd and systemd-boot
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index e8f3bae01a3..c514a709eed 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -81,6 +81,13 @@ jobs:
     - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
     - uses: systemd/mkosi@c9772ec920f1cd03181ba14e6fe2c3d35ccb4f92
 
+    # FIXME: temporary workaround for a file conflict between systemd (C9S) and
+    # systemd-boot (EPEL9). Drop this once systemd in C9S is updated to v252
+    # (should be done by the end of 2022).
+    - name: Fix C9S/EPEL9
+      if: ${{ matrix.release == '9-stream' }}
+      run: sudo sed -i '/add_packages/s/systemd-boot/systemd/g' /usr/local/lib/python3.10/dist-packages/mkosi/__init__.py
+
     - name: Install
       run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2