@@ -157,17 +157,20 @@ jobs:
157
157
cp ../../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
158
158
159
159
# 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 ..
163
163
164
164
cd ./KernelSU-Next
165
165
166
166
echo "Applying next SUSFS patches..."
167
167
susfs_version=$(grep '#define SUSFS_VERSION' ../common/include/linux/susfs.h | awk -F'"' '{print $2}')
168
168
echo "SUSVER=$susfs_version" >> $GITHUB_ENV
169
169
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 ..
171
174
echo "KSUVER=$KSU_VERSION" >> $GITHUB_ENV
172
175
echo "KernelSU Next Version: $KSU_VERSION"
173
176
echo "SusFS Version: $susfs_version"
@@ -178,14 +181,14 @@ jobs:
178
181
;;
179
182
"v1.5.8"|"v1.5.9")
180
183
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" ./
183
186
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" ./
185
188
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" ./
187
190
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" ./
189
192
patch -p1 --forward --fuzz=3 < fix_ksud.c.patch
190
193
;;
191
194
*)
0 commit comments