mkosi: Remove Arch nspawn workaround
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 25 Feb 2022 11:01:07 +0000 (11:01 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Sat, 5 Mar 2022 21:03:32 +0000 (21:03 +0000)
This has been fixed so the workaround can be removed.

(cherry picked from commit 6b2ab8fc5cc0f706b85cbd559e8dcf4e05d7687d)

.github/workflows/mkosi.yml

index 8fd6c72e268790da87442d50730a9946c688c46a..68d5f86dc3dcc1ebe4b94a0776f9a171274d278c 100644 (file)
@@ -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