Skip to content

Commit

Permalink
mkosi: work around a file conflict between systemd and systemd-boot
Browse files Browse the repository at this point in the history
(cherry picked from commit a32831a)
(cherry picked from commit 864c10a)
  • Loading branch information
mrc0mmand authored and bluca committed Dec 16, 2022
1 parent 6a8b9e9 commit aca62e1
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/mkosi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,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

Expand Down

0 comments on commit aca62e1

Please sign in to comment.