ソースを参照

ci(susfs): adjust patch application conditions and add fuzz tolerance

The patch command now uses `-F3` to tolerate fuzz in the main SUSFS patch, increasing robustness against minor context mismatches. Also, the condition for applying the `base.c.patch` has been changed from `SUBLEVEL -le 141` to `SUBLEVEL -le 0`, effectively disabling it, while the `namespace.c.patch` application for higher sublevels has been removed entirely.
TheWildJames 4 ヶ月 前
コミット
301de8be75

+ 1 - 6
.github/actions/susfs-patches/action.yml

@@ -101,16 +101,11 @@ runs:
         SUBLEVEL=${{ env.SUBLEVEL }}
         SUSFS_VERSION=${{ env.SUSFS_VERSION }}
 
-        if [[ "$SUBLEVEL" -le 141 ]]; then
+        if [[ "$SUBLEVEL" -le 0 ]]; then
           cp ${{ github.workspace }}/kernel_patches/wild/susfs_fix_patches/${SUSFS_VERSION}/a14-6.1/base.c.patch ./
           patch -p1 < base.c.patch
         fi
 
-        if [[ "$SUBLEVEL" -ge 162 ]]; then
-          cp ${{ github.workspace }}/kernel_patches/wild/susfs_fix_patches/${SUSFS_VERSION}/a14-6.1/namespace.c.patch ./
-          patch -p1 < namespace.c.patch
-        fi
-
         if [[ "$SUBLEVEL" -le 75 && "${{ inputs.os_patch_level }}" != "2024-05" ]]; then
           sed -i -e 's/goto show_pad;/return 0;/' ./fs/proc/task_mmu.c
         fi

+ 1 - 1
.github/actions/susfs/action.yml

@@ -85,7 +85,7 @@ runs:
         cp "${{ github.workspace }}/susfs4ksu/kernel_patches/fs/"* "${{ github.workspace }}/kernel/common/fs/"
         cp "${{ github.workspace }}/susfs4ksu/kernel_patches/include/linux/"* "${{ github.workspace }}/kernel/common/include/linux/"
         cp ${{ github.workspace }}/susfs4ksu/kernel_patches/50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch ./
-        patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
+        patch -p1 -F3 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
 
     - name: Apply KSU SUSFS Patches
       shell: bash