Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions .github/actions/build-kernel/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,66 @@ runs:
echo "ReSukiSU Version: $KSU_VERSION"
echo "✅ ReSukiSU added (commit: ${KSU_COMMIT_SHA:0:8})"
echo "::endgroup::"

- name: Apply recovery-skip patch to ReSukiSU
shell: bash
if: ${{ inputs.ksu_type == 'ReSukiSU' }}
run: |
set -euo pipefail
echo "::group::Apply recovery-skip patch"

# The patch file lives in the workflow repo (action-source/), NOT in
# WildKernels/kernel_patches — so we use action-source as the source root.

PATCH="$GITHUB_WORKSPACE/action-source/patches/resukisu-skip-recovery.patch"
if [ ! -f "$PATCH" ]; then
echo "::warning::resukisu-skip-recovery.patch not found at $PATCH — skipping"
else
cd "$KSU_FOLDER"
echo "Applying recovery-skip patch against ReSukiSU source..."
if ! patch -p1 --fuzz=3 --forward < "$PATCH"; then
echo "::error::ReSukiSU recovery-skip patch failed. Rejects:"
find . -name "*.rej" -exec echo "=== {} ===" \; -exec cat {} \;
exit 1
fi
echo "✅ recovery-skip patch applied"
fi
echo "::endgroup::"

- name: Verify recovery-skip patch landed correctly
if: ${{ inputs.ksu_type == 'ReSukiSU' }}
shell: bash
run: |
set -euo pipefail
f="$KSU_FOLDER/kernel/core/init.c"
echo "::group::Patched init.c — recovery-skip region"

# 1) Helper exists and sits ABOVE kernelsu_init
helper_line=$(grep -nE '^[[:space:]]*static bool __init ksu_is_recovery_boot\b' "$f" | head -1 | cut -d: -f1)
init_line=$(grep -nE '^[[:space:]]*int __init kernelsu_init\b' "$f" | head -1 | cut -d: -f1)
if [ -z "$helper_line" ]; then echo "::error::ksu_is_recovery_boot() helper missing"; exit 1; fi
if [ -z "$init_line" ]; then echo "::error::kernelsu_init() not found"; exit 1; fi
if [ "$helper_line" -ge "$init_line" ]; then
echo "::error::helper at line $helper_line is not above kernelsu_init at line $init_line"
exit 1
fi
echo " helper at line $helper_line | kernelsu_init at line $init_line"

# 2) Guard is the FIRST statement inside kernelsu_init()
region=$(sed -n "${init_line},$((init_line+15))p" "$f")
first_stmt=$(printf '%s\n' "$region" \
| sed -e '1d' -e '/^[[:space:]]*$/d' -e '/^[[:space:]]*{/d' \
| head -1)
if ! printf '%s' "$first_stmt" | grep -qE '^[[:space:]]*if[[:space:]]*\(ksu_is_recovery_boot'; then
echo "::error::guard is NOT the first statement in kernelsu_init():"
printf '%s\n' "$region" | sed -n '1,8p'
exit 1
fi
echo " ✅ guard is first statement inside kernelsu_init()"

sed -n "$((helper_line-1)),$((init_line+6))p" "$f"
echo "::endgroup::"

- name: Apply SUSFS Patches
shell: bash
if: ${{ env.OP_SUSFS == 'true' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-kernel-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ jobs:
susfs_ver="none"
fi
full_model="${model}_${os_version}_${kernel_version}"
device_info["$full_model"]="$model|$os_version|$kernel_version|$ksu_type|$ksu_ver|$susfs_ver"
device_info["$full_model"]="$model|$os_version|$kernel_version|$ksu_type|$ksu_ver|$susfs_ver|$zipname"
fi
done

Expand Down Expand Up @@ -1029,7 +1029,7 @@ jobs:

if [ ${#device_info[@]} -gt 0 ]; then
first_entry=$(printf '%s\n' "${!device_info[@]}" | sort | head -n1)
IFS='|' read -r _ _ _ _ _ ksu_ver_global _ <<< "${device_info["$first_entry"]}"
IFS='|' read -r _ _ _ _ ksu_ver_global _ _ <<< "${device_info["$first_entry"]}"
else
echo "::error::No device info found!" >&2
exit 1
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-ACE-2V.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-ACE-3-PRO.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": true,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-ACE-RACE.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-ACE.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-NORD-3.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-PAD-GO.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-PAD-MT6983.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP-PAD-PRO.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": true,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP10pro.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": true,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP10r.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP11.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": true,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP11r.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": true,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos14/OP12.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": true,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-2-5.10.209.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-2-PRO-5.15.149.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-2-PRO.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-2V-5.10.209.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-2V.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-3-5.15.149.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-3-PRO-6.1.75.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-3-PRO.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-3.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-3V-6.1.75.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-3V.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5-6.1.75.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5-PRO-6.6.30.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": true,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5-PRO.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": true,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5-RACE.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5-ULTRA-6.6.50.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": true,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5-ULTRA.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": true,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5.10.209.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5.10.226.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-5.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-RACE-5.10.209.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-RACE-5.10.226.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE-RACE.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-ACE.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
1 change: 1 addition & 0 deletions configs/oos15/OP-NORD-3-5.10.209.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"disk_cleanup": false,
"hmbird": false,
"susfs": true,
"opt": true,
"ds": true,
"bbg": true,
"bbr": true,
Expand Down
Loading