From 41d053dc96ac118bfc1af729d6576cdb2bececda Mon Sep 17 00:00:00 2001 From: Pablo Curiel Date: Sat, 24 Feb 2024 11:59:29 +0100 Subject: [PATCH] Update libusbhsfs. CI/CD workflow has also been updated to avoid building libusbhsfs dependencies. --- .github/workflows/rewrite.yml | 12 +++--------- libs/libusbhsfs | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rewrite.yml b/.github/workflows/rewrite.yml index 32ce1f5..a479b25 100644 --- a/.github/workflows/rewrite.yml +++ b/.github/workflows/rewrite.yml @@ -23,13 +23,12 @@ jobs: image: devkitpro/devkita64 steps: # Workaround: avoid requesting data from devkitPro servers because they ban most CI/CD scripts. - # TODO: Remove the last dkp-pacman invocation if https://github.com/devkitPro/docker/pull/28 gets accepted + # TODO: completely remove this step after the devkitA64 Docker image gets updated, since it should contain the NTFS-3G and lwext4 portlibs. - name: Update packages run: | - sudo -n apt-get update - sudo -n apt-get upgrade -y patch autoconf automake tar bzip2 diffutils pkgconf fakeroot git file zstd sudo -n dkp-pacman --noconfirm -U \ - "https://wii.leseratte10.de/devkitPro/other-stuff/dkp-toolchain-vars-1.0.3-2-any.pkg.tar.zst" + "https://wii.leseratte10.de/devkitPro/switch/switch-ntfs-3g-2022.10.3-4-any.pkg.tar.zst" \ + "https://wii.leseratte10.de/devkitPro/switch/switch-lwext4-1.0.0-1-any.pkg.tar.zst" - uses: actions/checkout@v4 with: @@ -51,11 +50,6 @@ jobs: run: | make install -j$(nproc) - - name: Build libusbhsfs dependencies - working-directory: nxdumptool/libs/libusbhsfs - run: | - make fs-libs - - name: Build nxdumptool-rewrite PoC binary working-directory: nxdumptool run: | diff --git a/libs/libusbhsfs b/libs/libusbhsfs index 30f521c..b1ff881 160000 --- a/libs/libusbhsfs +++ b/libs/libusbhsfs @@ -1 +1 @@ -Subproject commit 30f521cc9536473f8a05d5a792d986f3d2c6af98 +Subproject commit b1ff8811a762adf1b585b762b21308d458d43bfa