|
28 | 28 | required: true |
29 | 29 | type: string |
30 | 30 | default: stable |
| 31 | + susfs_branch: |
| 32 | + required: true |
| 33 | + type: string |
| 34 | + default: "gki-android13-5.15" |
31 | 35 |
|
32 | 36 | jobs: |
33 | 37 | build-kernel-oneplus-kernelsu-susfs: |
@@ -85,16 +89,32 @@ jobs: |
85 | 89 | echo "Cloning AnyKernel3 and other dependencies..." |
86 | 90 | |
87 | 91 | ANYKERNEL_BRANCH="gki-2.0" |
88 | | - SUSFS_BRANCH="gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}" |
| 92 | + if [[ -z "${{ inputs.susfs_branch }}" ]]; then |
| 93 | + SUSFS_BRANCH="gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}" |
| 94 | + else |
| 95 | + SUSFS_BRANCH="${{ inputs.susfs_branch }}" |
| 96 | + fi |
89 | 97 | |
90 | 98 | # Debug print the branches |
91 | 99 | echo "Using branch for AnyKernel3: $ANYKERNEL_BRANCH" |
92 | 100 | echo "Using branch for SUSFS: $SUSFS_BRANCH" |
93 | 101 | |
94 | 102 | # Clone repositories using the branch names |
95 | 103 | git clone https://github.com/TheWildJames/AnyKernel3.git -b "$ANYKERNEL_BRANCH" |
96 | | - git clone https://gitlab.com/simonpunk/susfs4ksu.git -b "$SUSFS_BRANCH" |
97 | 104 | git clone https://github.com/TheWildJames/kernel_patches.git |
| 105 | + |
| 106 | + # Clone the repo with all branches and history (can optimize later if needed) |
| 107 | + git clone https://gitlab.com/simonpunk/susfs4ksu.git |
| 108 | + cd susfs4ksu || exit 1 |
| 109 | + |
| 110 | + # Try to check if TARGET_REF is a valid branch or tag |
| 111 | + if git rev-parse --verify "origin/$SUSFS_BRANCH" >/dev/null 2>&1 || git rev-parse --verify "$SUSFS_BRANCH" >/dev/null 2>&1 ; then |
| 112 | + # It's a branch or commit hash |
| 113 | + git checkout "$SUSFS_BRANCH" |
| 114 | + else |
| 115 | + echo "Error: '$TARGET_REF' is neither a valid branch/tag nor a valid commit hash." |
| 116 | + exit 1 |
| 117 | + fi |
98 | 118 |
|
99 | 119 | - name: Initialize and Sync Kernel Source |
100 | 120 | run: | |
@@ -137,6 +157,9 @@ jobs: |
137 | 157 | cp ../../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/ |
138 | 158 | |
139 | 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 .. |
140 | 163 | |
141 | 164 | cd ./KernelSU-Next |
142 | 165 | |
@@ -183,17 +206,12 @@ jobs: |
183 | 206 | fi |
184 | 207 | patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true |
185 | 208 | |
186 | | - curl -Ls https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/susfs_test/test_kabi_2.patch | patch -p1 -F 3 |
187 | | - |
188 | | - grep -C 10 "ANDROID_KABI_RESERVE(4);" ./include/linux/sched.h |
189 | | - |
190 | 209 | if ! grep -qxF '#define CMD_SUSFS_HIDE_SUS_MNTS_FOR_ALL_PROCS 0x55561' ./include/linux/susfs_def.h; then |
191 | 210 | curl -Ls https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/hide_sus_mnts_for_all_procs.patch | patch -p1 -F 3 |
192 | 211 | else |
193 | 212 | echo "Line already present. Skipping SUSFS_HIDE_SUS_MNTS_FOR_ALL_PROCS Patch." |
194 | 213 | fi |
195 | 214 | |
196 | | - # curl -Ls https://github.com/ximi-libra-test/android_kernel_xiaomi_libra/commit/aa52855d8658cbee7f2a2e1cdb2d646efbaded59.patch | patch -p1 -F 3 |
197 | 215 | KERNEL_VERSION="${{ inputs.kernel_version }}" |
198 | 216 | MIN_VERSION="5.16" |
199 | 217 | |
|
0 commit comments