Răsfoiți Sursa

fix(susfs): gate pershoot patches to next flavor only

The two pinned pershoot patches (no-features core, Toolkit
coexistence) applied to every flavor. Tiann and ReSukiSU now use
the simonpunk checkout as-is.
TheWildJames 4 zile în urmă
părinte
comite
1f767d528f
2 a modificat fișierele cu 12 adăugiri și 2 ștergeri
  1. 11 2
      .github/actions/susfs-setup/action.yml
  2. 1 0
      .github/actions/susfs/action.yml

+ 11 - 2
.github/actions/susfs-setup/action.yml

@@ -8,6 +8,10 @@ inputs:
   version:
     description: 'Kernel config version (e.g., android15-6.6)'
     required: true
+  root_flavor:
+    description: 'Selected root implementation - pershoot patches only apply to next'
+    required: false
+    default: ""
 
 runs:
   using: "composite"
@@ -46,5 +50,10 @@ runs:
         echo "SUSFS_COMMIT=$SUSFS_COMMIT" >> "$GITHUB_ENV"
         echo "Using SUSFS commit: $SUSFS_COMMIT"
 
-        patch -p1 < "${{ github.workspace }}/kernel_patches/pershoot/susfs4ksu/0001-pershoot-Allow-core-to-be-built-with-no-features.patch"
-        patch -p1 < "${{ github.workspace }}/kernel_patches/pershoot/susfs4ksu/0002-pershoot-Implement-SuSFS-and-Toolkit-coexistence.patch"
+        # Pershoot's two commits (no-features core build, Toolkit coexistence)
+        # only apply to KernelSU-Next (dev-susfs fork). Other flavors use the
+        # simonpunk checkout as-is.
+        if [ "${{ inputs.root_flavor }}" = "next" ]; then
+          patch -p1 < "${{ github.workspace }}/kernel_patches/pershoot/susfs4ksu/0001-pershoot-Allow-core-to-be-built-with-no-features.patch"
+          patch -p1 < "${{ github.workspace }}/kernel_patches/pershoot/susfs4ksu/0002-pershoot-Implement-SuSFS-and-Toolkit-coexistence.patch"
+        fi

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

@@ -33,6 +33,7 @@ runs:
       with:
         susfs_commit: ${{ inputs.susfs_commit }}
         version: ${{ inputs.version }}
+        root_flavor: ${{ inputs.root_flavor }}
 
     - name: Enable SUSFS for KernelSU (tiann)
       # tiann/KernelSU main does NOT carry SUSFS, so for the kernelsu flavor we