|
@@ -50,10 +50,11 @@ runs:
|
|
|
echo "SUSFS_COMMIT=$SUSFS_COMMIT" >> "$GITHUB_ENV"
|
|
echo "SUSFS_COMMIT=$SUSFS_COMMIT" >> "$GITHUB_ENV"
|
|
|
echo "Using SUSFS commit: $SUSFS_COMMIT"
|
|
echo "Using SUSFS commit: $SUSFS_COMMIT"
|
|
|
|
|
|
|
|
- # 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.
|
|
|
|
|
|
|
+ # Pershoot's latest two gki-android14-6.1-dev commits (currently the
|
|
|
|
|
+ # no-features core build + Toolkit coexistence fixes) only apply to
|
|
|
|
|
+ # KernelSU-Next (dev-susfs fork). Other flavors use the simonpunk
|
|
|
|
|
+ # checkout as-is.
|
|
|
if [ "${{ inputs.root_flavor }}" = "next" ]; then
|
|
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"
|
|
|
|
|
|
|
+ git fetch https://gitlab.com/pershoot/susfs4ksu.git gki-android14-6.1-dev || true
|
|
|
|
|
+ git log ..FETCH_HEAD --oneline -n 2 | awk '{print $1}' | tac | xargs git cherry-pick 2>/dev/null || true
|
|
|
fi
|
|
fi
|