From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 25 Feb 2022 11:01:07 +0000 (+0000)
Subject: mkosi: Remove Arch nspawn workaround
X-Git-Tag: v251-rc1~222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b2ab8fc5cc0f706b85cbd559e8dcf4e05d7687d;p=thirdparty%2Fsystemd.git

mkosi: Remove Arch nspawn workaround

This has been fixed so the workaround can be removed.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index daf009a3b11..f24c313622f 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -48,19 +48,6 @@ jobs:
     - name: Configure
       run: echo -e "[Distribution]\nDistribution=${{ matrix.distro }}\n" >mkosi.default
 
-    # Ubuntu's systemd-nspawn doesn't support faccessat2() syscall, which is
-    # required, since current Arch's glibc implements faccessat() via faccessat2().
-    - name: Update systemd-nspawn
-      if: ${{ matrix.distro == 'arch' }}
-      run: |
-        echo "deb-src http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-        sudo apt update
-        sudo apt build-dep systemd
-        meson build
-        ninja -C build
-        sudo ln -svf "$PWD/build/systemd-nspawn" "$(which systemd-nspawn)"
-        systemd-nspawn --version
-
     - name: Build ${{ matrix.distro }}
       run: ./.github/workflows/run_mkosi.sh --build-environment=CI_BUILD=1 --kernel-command-line "${{ env.KERNEL_CMDLINE }}" build