@@ -157,17 +157,20 @@ jobs:
157157 cp ../../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
158158
159159 # curl -o ./common/fs/susfs.c -Ls https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/susfs_test/susfs_debug.c
160- cd ./common
161- curl -Ls https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/test_unicode.patch | patch -p1 -F 3
162- cd ..
160+ # cd ./common
161+ # curl -Ls https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/test_unicode.patch | patch -p1 -F 3
162+ # cd ..
163163
164164 cd ./KernelSU-Next
165165
166166 echo "Applying next SUSFS patches..."
167167 susfs_version=$(grep '#define SUSFS_VERSION' ../common/include/linux/susfs.h | awk -F'"' '{print $2}')
168168 echo "SUSVER=$susfs_version" >> $GITHUB_ENV
169169 BASE_VERSION=10200
170- KSU_VERSION=$(expr $(curl -sI -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/KernelSU-Next/KernelSU-Next/commits?sha=${{ inputs.ksun_branch }}&per_page=1" | grep -i "link:" | sed -n 's/.*page=\([0-9]*\)>; rel="last".*/\1/p') "+" $BASE_VERSION)
170+ cd ./kernel
171+ KSU_VERSION=$(expr $(/usr/bin/git rev-list --count HEAD) "+" $BASE_VERSION)
172+ sed -i "s/DKSU_VERSION=11998/DKSU_VERSION=${KSU_VERSION}/" Makefile
173+ cd ..
171174 echo "KSUVER=$KSU_VERSION" >> $GITHUB_ENV
172175 echo "KernelSU Next Version: $KSU_VERSION"
173176 echo "SusFS Version: $susfs_version"
@@ -178,14 +181,14 @@ jobs:
178181 ;;
179182 "v1.5.8"|"v1.5.9")
180183 cp ../../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
181- patch -p1 --forward --fuzz=3 < 10_enable_susfs_for_ksu.patch || true
182- cp ../../../kernel_patches/next/susfs_fix_patches/v1.5.8 /fix_apk_sign.c.patch ./
184+ patch -p1 --forward --fuzz=3 < 10_enable_susfs_for_ksu.patch # || true
185+ cp " ../../../kernel_patches/next/susfs_fix_patches/$susfs_version /fix_apk_sign.c.patch" ./
183186 patch -p1 --forward --fuzz=3 < fix_apk_sign.c.patch
184- cp ../../../kernel_patches/next/susfs_fix_patches/v1.5.8 /fix_core_hook.c.patch ./
187+ cp " ../../../kernel_patches/next/susfs_fix_patches/$susfs_version /fix_core_hook.c.patch" ./
185188 patch -p1 --forward --fuzz=3 < fix_core_hook.c.patch
186- cp ../../../kernel_patches/next/susfs_fix_patches/v1.5.8 /fix_selinux.c.patch ./
189+ cp " ../../../kernel_patches/next/susfs_fix_patches/$susfs_version /fix_selinux.c.patch" ./
187190 patch -p1 --forward --fuzz=3 < fix_selinux.c.patch
188- cp ../../../kernel_patches/next/susfs_fix_patches/v1.5.8 /fix_ksud.c.patch ./
191+ cp " ../../../kernel_patches/next/susfs_fix_patches/$susfs_version /fix_ksud.c.patch" ./
189192 patch -p1 --forward --fuzz=3 < fix_ksud.c.patch
190193 ;;
191194 *)
0 commit comments