TheWildJames 4 mēneši atpakaļ
vecāks
revīzija
10bf914e92
1 mainītis faili ar 23 papildinājumiem un 9 dzēšanām
  1. 23 9
      .github/actions/susfs/action.yml

+ 23 - 9
.github/actions/susfs/action.yml

@@ -56,7 +56,7 @@ runs:
           git clone "$SUSFS_REPO" -b "$SUSFS_BRANCH" --depth=1 susfs4ksu
         fi
         
-        SUSFS_VERSION="2.0.0"
+        SUSFS_VERSION="2.1.0"
         echo "SUSFS_VERSION=$SUSFS_VERSION" >> $GITHUB_ENV
 
     - name: Enable KernelSU SUSFS Config
@@ -91,11 +91,25 @@ runs:
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/KernelSU-Next
       run: |
-         for file in $(find ./kernel -maxdepth 2 -name "*.rej" -exec basename {} .rej \;); do
-            echo "Patching: $file"
-            patch -p1 --forward < "${{ github.workspace }}/kernel_patches/next/susfs_fix_patches/2.1.0/fix_${file}.patch"
-          done
-          patch -p1 --forward < "${{ github.workspace }}/kernel_patches/next/susfs_fix_patches/2.1.0/overwrite_hook_mode.patch"
-          patch -p1 --forward < "${{ github.workspace }}/kernel_patches/next/susfs_fix_patches/2.1.0/ksu_toolkit.patch"
-          patch -p1 --forward < "${{ github.workspace }}/kernel_patches/next/susfs_fix_patches/2.1.0/multi_manager.patch"
-          patch -p1 --forward < "${{ github.workspace }}/kernel_patches/next/susfs_fix_patches/2.1.0/multi_sepolicy_fix.patch"
+        set -e
+
+        PATCH_DIR="${{ github.workspace }}/kernel_patches/next/susfs_fix_patches/v2.1.0"
+        if [ ! -d "$PATCH_DIR" ]; then
+          echo "Error: SUSFS fix patch directory not found: $PATCH_DIR"
+          exit 1
+        fi
+
+        for file in $(find ./kernel -maxdepth 2 -name "*.rej" -exec basename {} .rej \;); do
+          fix_patch="${PATCH_DIR}/fix_${file}.patch"
+          if [ -f "$fix_patch" ]; then
+            echo "Patching file: $file with fix_${file}.patch"
+            patch -p1 --forward < "$fix_patch"
+          else
+            echo "Warning: missing fix patch for $file ($fix_patch), skipping"
+          fi
+        done
+
+        patch -p1 --forward < "${PATCH_DIR}/overwrite_hook_mode.patch"
+        patch -p1 --forward < "${PATCH_DIR}/ksu_toolkit.patch"
+        patch -p1 --forward < "${PATCH_DIR}/multi_manager.patch"
+        patch -p1 --forward < "${PATCH_DIR}/multi_sepolicy_fix.patch"