From b8e4ceb8ac5d12d1e293fb748b026b4eddb5dfbe Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Thu, 9 Jan 2025 09:26:26 +0100 Subject: [PATCH] fix ci? --- .gitea/workflows/action.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/action.yml b/.gitea/workflows/action.yml index b625017..2fb76a4 100644 --- a/.gitea/workflows/action.yml +++ b/.gitea/workflows/action.yml @@ -51,19 +51,26 @@ jobs: - name: "Usr merge" id: usrmerge run: | - cp -ax /bin /bin.backup - - # Convert /bin to a symlink + # For /bin first mv /bin/* /usr/bin/ rmdir /bin ln -s usr/bin /bin - - # Handle /lib - mv /lib/* /usr/lib/ + + # For /lib, we need to handle it directory by directory + # First, move all files in the root of /lib + mv /lib/[^s]* /usr/lib/ 2>/dev/null || true + + # Then handle each subdirectory carefully + cp -a /lib/systemd/* /usr/lib/systemd/ + cp -a /lib/udev/* /usr/lib/udev/ + cp -a /lib/x86_64-linux-gnu/* /usr/lib/x86_64-linux-gnu/ + + # Remove the now-empty directories + rm -rf /lib/systemd /lib/udev /lib/x86_64-linux-gnu rmdir /lib ln -s usr/lib /lib - # Now try installing usrmerge again + # Now try installing usrmerge apt update && apt install -y usrmerge - name: Install node if: ${{ steps.prereq.outputs.need_node == '1' }}