Skip to content

Commit c52a1bf

Browse files
committed
Fix SusFS patches and Scope min v1.4 for Latest KSUN change
1 parent cee7549 commit c52a1bf

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

.github/actions/action.yml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -191,19 +191,15 @@ runs:
191191
;;
192192
"v1.5.9")
193193
cp ../../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
194-
patch -p1 --forward --fuzz=3 < 10_enable_susfs_for_ksu.patch || true
195-
cp "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_apk_sign.c.patch" ./
196-
patch -p1 --forward --fuzz=3 < fix_apk_sign.c.patch
197-
cp "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_core_hook.c.patch" ./
198-
patch -p1 --forward --fuzz=3 < fix_core_hook.c.patch
199-
cp "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_selinux.c.patch" ./
200-
patch -p1 --forward --fuzz=3 < fix_selinux.c.patch
201-
cp "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_ksud.c.patch" ./
202-
patch -p1 --forward --fuzz=3 < fix_ksud.c.patch
203-
cp "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_rules.c.patch" ./
204-
patch -p1 --forward --fuzz=3 < fix_rules.c.patch
205-
cp "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_sucompat.c.patch" ./
206-
patch -p1 --forward --fuzz=3 < fix_sucompat.c.patch
194+
patch -p1 --forward < 10_enable_susfs_for_ksu.patch || true
195+
196+
for file in $(find ./kernel -maxdepth 2 -name "*.rej" -printf "%f\n" | cut -d'.' -f1); do
197+
echo "Patching file: $file.c with fix_$file.c.patch"
198+
patch -p1 --forward < "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_$file.c.patch"
199+
done
200+
201+
# Fix build errors (no rejects; Still giving errors)
202+
patch -p1 --forward < "../../../kernel_patches/next/susfs_fix_patches/$susfs_version/fix_kernel_compat.c.patch"
207203
;;
208204
*)
209205
echo "Invalid version: $susfs_version"
@@ -216,10 +212,6 @@ runs:
216212
# Change to common directory and apply SUSFS patch
217213
cd ../common
218214
219-
# SusFS Experimental Patches
220-
echo "Patching susfs_dentry_null_checks!"
221-
patch -p1 -F 3 < "../../../kernel_patches/experimental/susfs/susfs_dentry_checks.patch"
222-
223215
if [ "${{ inputs.android_version }}" = "android15" ] && [ "${{ inputs.kernel_version }}" = "6.6" ]; then
224216
if ! grep -qxF '#include <trace/hooks/fs.h>' ./fs/namespace.c; then
225217
sed -i '/#include <trace\/hooks\/blk.h>/a #include <trace\/hooks\/fs.h>' ./fs/namespace.c
@@ -258,7 +250,7 @@ runs:
258250
cd "$CONFIG/kernel_platform/common"
259251
echo "Applying KSUN Hooks..."
260252
cp ../../../kernel_patches/next/scope_min_manual_hooks_v1.4.patch ./manual_hooks.patch
261-
patch -p1 --fuzz=3 < ./manual_hooks.patch
253+
patch -p1 < ./manual_hooks.patch
262254
263255
- name: Apply Hide Stuff Patches
264256
shell: bash

0 commit comments

Comments
 (0)