Skip to content

Commit 634181e

Browse files
committed
Add SuSFS v1.5.10+ Support
1 parent d234d7e commit 634181e

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

.github/actions/action.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,10 @@ runs:
9393
echo "Initializing and syncing kernel source..."
9494
if [[ "${{ inputs.manifest }}" == https://* ]]; then
9595
mkdir -p .repo/manifests
96-
curl --fail --show-error --location --proto '=https' \
97-
"${{ inputs.manifest }}" -o .repo/manifests/temp_manifest.xml
98-
"$REPO" init -u https://github.com/OnePlusOSS/kernel_manifest.git \
99-
-b oneplus/sm8650 -m temp_manifest.xml --repo-rev=v2.16 \
100-
--depth=1 --no-clone-bundle --no-tags
96+
curl --fail --show-error --location --proto '=https' "${{ inputs.manifest }}" -o .repo/manifests/temp_manifest.xml
97+
"$REPO" init -u https://github.com/OnePlusOSS/kernel_manifest.git -b oneplus/sm8650 -m temp_manifest.xml --repo-rev=v2.16 --depth=1 --no-clone-bundle --no-tags
10198
else
102-
"$REPO" init -u https://github.com/OnePlusOSS/kernel_manifest.git \
103-
-b "${{ inputs.branch }}" -m "${{ inputs.manifest }}" \
104-
--repo-rev=v2.16 --depth=1 --no-clone-bundle --no-tags
99+
"$REPO" init -u https://github.com/OnePlusOSS/kernel_manifest.git -b "${{ inputs.branch }}" -m "${{ inputs.manifest }}" --repo-rev=v2.16 --depth=1 --no-clone-bundle --no-tags
105100
fi
106101
"$REPO" --version
107102
success=false
@@ -245,6 +240,15 @@ runs:
245240
done
246241
patch -p1 --forward < "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_kernel_compat.c.patch"
247242
;;
243+
"v1.5.10")
244+
cp ../../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
245+
patch -p1 --forward < 10_enable_susfs_for_ksu.patch || true
246+
for file in $(find ./kernel -maxdepth 2 -name "*.rej" -printf "%f\n" | cut -d'.' -f1); do
247+
echo "Patching file: $file.c with fix_$file.c.patch"
248+
patch -p1 --forward < "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_$file.c.patch"
249+
done
250+
patch -p1 --forward < "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_kernel_compat.c.patch"
251+
;;
248252
*)
249253
echo "Invalid version: $susfs_version"
250254
exit 1
@@ -266,7 +270,7 @@ runs:
266270
else
267271
echo "Kernel >= $MIN_VERSION, skipping ptrace patch"
268272
fi
269-
if [ "${{ inputs.model }}" == "OPAce5Pro" ] || [ "${{ inputs.model }}" == "OP13" ] || [ "${{ inputs.model }}" = "OP13-GLO" ]; then
273+
if [ "${{ inputs.model }}" == "OPAce5Pro" ] || [ "${{ inputs.model }}" == "OP13" ] || [ "${{ inputs.model }}" == "OP13-GLO" ]; then
270274
echo "Patching hmbird!"
271275
echo 'obj-y += hmbird_patch.o' >> ./drivers/Makefile
272276
patch -p1 -F 3 < "../../../kernel_patches/oneplus/hmbird/hmbird_kernel_patch.patch"
@@ -283,7 +287,7 @@ runs:
283287
run: |
284288
set -euo pipefail
285289
cd "$CONFIG/kernel_platform/common"
286-
patch -p1 < ../../../kernel_patches/next/scope_min_manual_hooks_v1.5.patch
290+
patch -p1 < ../../../kernel_patches/next/scope_min_manual_hooks_v1.4.patch
287291
288292
- name: Add KernelSU-Next and SUSFS Configuration Settings
289293
shell: bash
@@ -489,7 +493,7 @@ runs:
489493
cd "$GITHUB_WORKSPACE/AnyKernel3"
490494

491495
# Optional hmbird patch logic
492-
if [ "${{ inputs.model }}" = "OPAce5Pro" ] || [ "${{ inputs.model }}" = "OP13" ] || [ "${{ inputs.model }}" = "OP13-GLO" ]; then
496+
if [ "${{ inputs.model }}" == "OPAce5Pro" ] || [ "${{ inputs.model }}" == "OP13" ] || [ "${{ inputs.model }}" == "OP13-GLO" ]; then
493497
cp "$GITHUB_WORKSPACE/kernel_patches/oneplus/hmbird/bins/"* ./tools/ 2>/dev/null || true
494498
patch -F 3 < "$GITHUB_WORKSPACE/kernel_patches/oneplus/hmbird/ak3_hmbird_patch.patch"
495499
fi

.github/workflows/build-kernel-release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- model: OP13-GLO
7676
soc: sun
7777
branch: oneplus/sm8750
78-
manifest: oneplus_13_global.xml
78+
manifest: oneplus_13_global.xml
7979
android_version: android15
8080
kernel_version: '6.6'
8181
- model: OPAce5Pro
@@ -390,16 +390,16 @@ jobs:
390390
REPO_OWNER: ${{ github.repository_owner }}
391391
REPO_NAME: ${{ github.event.repository.name }}
392392
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
393-
RELEASE_NAME: 'TEST BUILD OnePlus Kernels With KernelSU Next & SUSFS v1.5.9 TEST BUILD'
393+
RELEASE_NAME: '*TEST BUILD* OnePlus Kernels With KernelSU Next & SUSFS v1.5.10 *TEST BUILD*'
394394
steps:
395395
- name: Checkout code
396396
uses: actions/checkout@v4
397397
with:
398-
fetch-depth: 1
398+
fetch-depth: 0
399399

400400
- name: Generate and Create New Tag
401401
run: |
402-
BASE_TAG="v1.5.9-r0"
402+
BASE_TAG="v1.5.10-r0"
403403
LATEST_TAG=$(gh api repos/$REPO_OWNER/$REPO_NAME/tags --jq '.[0].name')
404404
if [ -z "$LATEST_TAG" ]; then
405405
LATEST_TAG="$BASE_TAG"
@@ -422,7 +422,7 @@ jobs:
422422
run: |
423423
echo "=== Start building the release notes ==="
424424
cat << EOF > release_notes.md
425-
This release contains KernelSU Next and SUSFS v1.5.9
425+
This release contains KernelSU Next and SUSFS v1.5.10
426426
427427
Module:
428428
-> https://github.com/sidex15/ksu_module_susfs
@@ -453,11 +453,11 @@ jobs:
453453
454454
### Features
455455
- [+] KernelSU-Next / WildKSU Manager Support
456-
- [+] SUSFS v1.5.9
456+
- [+] SUSFS v1.5.10
457457
- [+] Wireguard Support
458458
- [+] Magic Mount Support
459459
- [+] Ptrace message leak fix for kernels < 5.16
460-
- [+] Manual Hooks [scope_min_manual_hooks_v1.5]
460+
- [+] Manual Hooks [scope_min_manual_hooks_v1.4]
461461
- [+] CONFIG_TMPFS_XATTR Support [Mountify Support]
462462
- [+] BBR v1 Support
463463
- [+] HMBIRD scx support for OnePlus 13 & OnePlus Ace 5 Pro

0 commit comments

Comments
 (0)