Skip to content

Commit 71a77d8

Browse files
fatalcoder524fatalcoder524
committed
Test spinlock throne_tracker and ptrace patch
1 parent cbe581b commit 71a77d8

File tree

2 files changed

+112
-149
lines changed

2 files changed

+112
-149
lines changed

‎.github/workflows/build-kernel-release.yml‎

Lines changed: 59 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -36,48 +36,6 @@ jobs:
3636
manifest: oneplus_11_v.xml
3737
android_version: android13
3838
kernel_version: "5.15"
39-
- model: OP11r
40-
soc: waipio
41-
branch: oneplus/sm8475
42-
manifest: oneplus_11r_v.xml
43-
android_version: android12
44-
kernel_version: "5.10"
45-
- model: OP-OPEN
46-
soc: kalama
47-
branch: oneplus/sm8550
48-
manifest: oneplus_open_v.xml
49-
android_version: android13
50-
kernel_version: "5.15"
51-
- model: OP-ACE-2
52-
soc: waipio
53-
branch: oneplus/sm8475
54-
manifest: oneplus_ace2_v.xml
55-
android_version: android13
56-
kernel_version: "5.10"
57-
- model: OP10t
58-
soc: waipio
59-
branch: oneplus/sm8475
60-
manifest: oneplus_10t_v.xml
61-
android_version: android12
62-
kernel_version: "5.10"
63-
- model: OP10pro
64-
soc: waipio
65-
branch: oneplus/sm8450
66-
manifest: oneplus_10_pro_v.xml
67-
android_version: android12
68-
kernel_version: "5.10"
69-
- model: OP-ACE-2-PRO
70-
soc: kalama
71-
branch: oneplus/sm8550
72-
manifest: oneplus_ace2pro_v.xml
73-
android_version: android13
74-
kernel_version: "5.15"
75-
- model: OP12r
76-
soc: kalama
77-
branch: oneplus/sm8550
78-
manifest: oneplus_12r_v.xml
79-
android_version: android13
80-
kernel_version: "5.15"
8139
uses: ./.github/workflows/build.yml
8240
secrets: inherit
8341
with:
@@ -89,70 +47,70 @@ jobs:
8947
kernel_version: ${{ matrix.kernel_version }}
9048
ksun_branch: ${{ inputs.ksun_branch }}
9149

92-
build-batch-2:
50+
# build-batch-2:
9351
# needs: build-batch-1
94-
name: build-batch-2 (${{ matrix.model }}, ${{ matrix.soc }}, ${{ matrix.branch }}, ${{ matrix.manifest }}, ${{ matrix.android_version }}, ${{ matrix.kernel_version }}, ${{ inputs.ksun_branch }})
95-
strategy:
96-
fail-fast: false
97-
matrix:
98-
include:
99-
- model: OP13
100-
soc: sun
101-
branch: oneplus/sm8750
102-
manifest: oneplus_13.xml
103-
android_version: android15
104-
kernel_version: "6.6"
105-
- model: OPAce5Pro
106-
soc: sun
107-
branch: oneplus/sm8750
108-
manifest: oneplus_ace5_pro.xml
109-
android_version: android15
110-
kernel_version: "6.6"
111-
- model: OP12
112-
soc: pineapple
113-
branch: oneplus/sm8650
114-
manifest: oneplus12_v.xml
115-
android_version: android14
116-
kernel_version: "6.1"
117-
- model: OP13r
118-
soc: pineapple
119-
branch: oneplus/sm8650
120-
manifest: oneplus_13r.xml
121-
android_version: android14
122-
kernel_version: "6.1"
123-
- model: OP-ACE-5
124-
soc: pineapple
125-
branch: oneplus/sm8650
126-
manifest: oneplus_ace5.xml
127-
android_version: android14
128-
kernel_version: "6.1"
129-
- model: OP-NORD-4
130-
soc: pineapple
131-
branch: oneplus/sm7675
132-
manifest: oneplus_nord_4_v.xml
133-
android_version: android14
134-
kernel_version: "6.1"
135-
- model: OP-PAD-2
136-
soc: pineapple
137-
branch: oneplus/sm8650
138-
manifest: oneplus_pad2_v.xml
139-
android_version: android14
140-
kernel_version: "6.1"
141-
uses: ./.github/workflows/build.yml
142-
secrets: inherit
143-
with:
144-
model: ${{ matrix.model }}
145-
soc: ${{ matrix.soc }}
146-
branch: ${{ matrix.branch }}
147-
manifest: ${{ matrix.manifest }}
148-
android_version: ${{ matrix.android_version }}
149-
kernel_version: ${{ matrix.kernel_version }}
150-
ksun_branch: ${{ inputs.ksun_branch }}
52+
# name: build-batch-2 (${{ matrix.model }}, ${{ matrix.soc }}, ${{ matrix.branch }}, ${{ matrix.manifest }}, ${{ matrix.android_version }}, ${{ matrix.kernel_version }}, ${{ inputs.ksun_branch }})
53+
# strategy:
54+
# fail-fast: false
55+
# matrix:
56+
# include:
57+
# - model: OP13
58+
# soc: sun
59+
# branch: oneplus/sm8750
60+
# manifest: oneplus_13.xml
61+
# android_version: android15
62+
# kernel_version: "6.6"
63+
# - model: OPAce5Pro
64+
# soc: sun
65+
# branch: oneplus/sm8750
66+
# manifest: oneplus_ace5_pro.xml
67+
# android_version: android15
68+
# kernel_version: "6.6"
69+
# - model: OP12
70+
# soc: pineapple
71+
# branch: oneplus/sm8650
72+
# manifest: oneplus12_v.xml
73+
# android_version: android14
74+
# kernel_version: "6.1"
75+
# - model: OP13r
76+
# soc: pineapple
77+
# branch: oneplus/sm8650
78+
# manifest: oneplus_13r.xml
79+
# android_version: android14
80+
# kernel_version: "6.1"
81+
# - model: OP-ACE-5
82+
# soc: pineapple
83+
# branch: oneplus/sm8650
84+
# manifest: oneplus_ace5.xml
85+
# android_version: android14
86+
# kernel_version: "6.1"
87+
# - model: OP-NORD-4
88+
# soc: pineapple
89+
# branch: oneplus/sm7675
90+
# manifest: oneplus_nord_4_v.xml
91+
# android_version: android14
92+
# kernel_version: "6.1"
93+
# - model: OP-PAD-2
94+
# soc: pineapple
95+
# branch: oneplus/sm8650
96+
# manifest: oneplus_pad2_v.xml
97+
# android_version: android14
98+
# kernel_version: "6.1"
99+
# uses: ./.github/workflows/build.yml
100+
# secrets: inherit
101+
# with:
102+
# model: ${{ matrix.model }}
103+
# soc: ${{ matrix.soc }}
104+
# branch: ${{ matrix.branch }}
105+
# manifest: ${{ matrix.manifest }}
106+
# android_version: ${{ matrix.android_version }}
107+
# kernel_version: ${{ matrix.kernel_version }}
108+
# ksun_branch: ${{ inputs.ksun_branch }}
151109

152110
trigger-release:
153111
needs:
154112
- build-batch-1
155-
- build-batch-2
113+
# - build-batch-2
156114
runs-on: ubuntu-latest
157115
if: ${{ inputs.make_release }}
158116
env:

‎.github/workflows/build.yml‎

Lines changed: 53 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -137,47 +137,52 @@ jobs:
137137
echo "Changing to configuration directory: $CONFIG..."
138138
cd "$CONFIG/kernel_platform"
139139
140-
echo "Applying SUSFS patches..."
140+
# echo "Applying SUSFS patches..."
141141
142-
# Copy SUSFS patches
143-
cp ../../susfs4ksu/kernel_patches/50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch ./common/
144-
cp ../../susfs4ksu/kernel_patches/fs/* ./common/fs/
145-
cp ../../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
142+
# # Copy SUSFS patches
143+
# cp ../../susfs4ksu/kernel_patches/50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch ./common/
144+
# cp ../../susfs4ksu/kernel_patches/fs/* ./common/fs/
145+
# cp ../../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
146146
147147
cd ./KernelSU-Next
148148
149-
if [ "${{ inputs.ksun_branch }}" == "stable" ] || [ "${{ inputs.ksun_branch }}" == "next" ]; then
150-
echo "Applying next SUSFS patches..."
151-
cp ../../../kernel_patches/next/kernel-patch-susfs-v1.5.7-to-KernelSU-Next.patch ./ksun_susfs_latest.patch
152-
patch -p1 --forward < ksun_susfs_latest.patch || true
153-
fi
154-
155-
# Determine base version based on branch
156-
if [ "${{ inputs.ksun_branch }}" == "stable" ]; then
157-
BASE_VERSION=10200
158-
elif [ "${{ inputs.ksun_branch }}" == "next" ]; then
159-
BASE_VERSION=10200
160-
elif [ "${{ inputs.ksun_branch }}" == "next-susfs" ]; then
161-
BASE_VERSION=10198
162-
elif [ "${{ inputs.ksun_branch }}" == "next-susfs-dev" ]; then
163-
BASE_VERSION=10198
164-
else
165-
BASE_VERSION=10200
166-
fi
149+
curl -Ls https://github.com/KernelSU-Next/KernelSU-Next/commit/6a6fc07cd437334a99bda15f562a20ee0654fed0.patch | patch -p1 -F 3 -R
150+
curl -Ls https://github.com/backslashxx/KernelSU/commit/456a9c719684d98983b70c524934e59d279ccf91.patch | patch -p1 -F 3
151+
152+
# if [ "${{ inputs.ksun_branch }}" == "stable" ] || [ "${{ inputs.ksun_branch }}" == "next" ]; then
153+
# echo "Applying next SUSFS patches..."
154+
# cp ../../../kernel_patches/next/kernel-patch-susfs-v1.5.7-to-KernelSU-Next.patch ./ksun_susfs_latest.patch
155+
# patch -p1 --forward < ksun_susfs_latest.patch || true
156+
# fi
157+
158+
# # Determine base version based on branch
159+
# if [ "${{ inputs.ksun_branch }}" == "stable" ]; then
160+
# BASE_VERSION=10200
161+
# elif [ "${{ inputs.ksun_branch }}" == "next" ]; then
162+
# BASE_VERSION=10200
163+
# elif [ "${{ inputs.ksun_branch }}" == "next-susfs" ]; then
164+
# BASE_VERSION=10198
165+
# elif [ "${{ inputs.ksun_branch }}" == "next-susfs-dev" ]; then
166+
# BASE_VERSION=10198
167+
# else
168+
# BASE_VERSION=10200
169+
# fi
167170
168171
cd ./kernel
169-
KSU_VERSION=$(expr $(/usr/bin/git rev-list --count HEAD) "+" $BASE_VERSION)
170-
echo "KSUVER=$KSU_VERSION" >> $GITHUB_ENV
171-
sed -i "s/DKSU_VERSION=11998/DKSU_VERSION=${KSU_VERSION}/" Makefile
172+
# KSU_VERSION=$(expr $(/usr/bin/git rev-list --count HEAD) "+" $BASE_VERSION)
173+
# echo "KSUVER=$KSU_VERSION" >> $GITHUB_ENV
174+
# sed -i "s/DKSU_VERSION=11998/DKSU_VERSION=${KSU_VERSION}/" Makefile
172175
173-
# Change to common directory and apply SUSFS patch
176+
# # Change to common directory and apply SUSFS patch
174177
cd ../../common
175-
if [ "${{ inputs.soc }}" == "sun" ]; then
176-
sed -i '/#include <trace\/hooks\/blk.h>/a #include <trace/hooks/fs.h>' ./fs/namespace.c
177-
fi
178-
patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
178+
# if [ "${{ inputs.soc }}" == "sun" ]; then
179+
# sed -i '/#include <trace\/hooks\/blk.h>/a #include <trace/hooks/fs.h>' ./fs/namespace.c
180+
# fi
181+
# patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
179182
echo "Patching ptrace!"
180-
curl -Ls https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/ptrace.patch | patch -p1 -F 3
183+
# curl -Ls https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/ptrace.patch | patch -p1 -F 3
184+
curl -Ls https://github.com/ximi-libra-test/android_kernel_xiaomi_libra/commit/4f9a25b58a33699f0acaf13c83e1efda8bf0f046.patch | patch -p1 -F 3
185+
181186
182187
- name: Apply KSUN Hooks
183188
run: |
@@ -207,22 +212,22 @@ jobs:
207212
echo "CONFIG_KSU_KPROBES_HOOK=n" >> ./common/arch/arm64/configs/gki_defconfig
208213
209214
# Add SUSFS configuration settings
210-
echo "CONFIG_KSU_SUSFS=y" >> ./common/arch/arm64/configs/gki_defconfig
211-
echo "CONFIG_KSU_SUSFS_HAS_MAGIC_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
212-
echo "CONFIG_KSU_SUSFS_SUS_PATH=y" >> ./common/arch/arm64/configs/gki_defconfig
213-
echo "CONFIG_KSU_SUSFS_SUS_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
214-
echo "CONFIG_KSU_SUSFS_AUTO_ADD_SUS_KSU_DEFAULT_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
215-
echo "CONFIG_KSU_SUSFS_AUTO_ADD_SUS_BIND_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
216-
echo "CONFIG_KSU_SUSFS_SUS_KSTAT=y" >> ./common/arch/arm64/configs/gki_defconfig
217-
echo "CONFIG_KSU_SUSFS_SUS_OVERLAYFS=n" >> ./common/arch/arm64/configs/gki_defconfig
218-
echo "CONFIG_KSU_SUSFS_TRY_UMOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
219-
echo "CONFIG_KSU_SUSFS_AUTO_ADD_TRY_UMOUNT_FOR_BIND_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
220-
echo "CONFIG_KSU_SUSFS_SPOOF_UNAME=y" >> ./common/arch/arm64/configs/gki_defconfig
221-
echo "CONFIG_KSU_SUSFS_ENABLE_LOG=y" >> ./common/arch/arm64/configs/gki_defconfig
222-
echo "CONFIG_KSU_SUSFS_HIDE_KSU_SUSFS_SYMBOLS=y" >> ./common/arch/arm64/configs/gki_defconfig
223-
echo "CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y" >> ./common/arch/arm64/configs/gki_defconfig
224-
echo "CONFIG_KSU_SUSFS_OPEN_REDIRECT=y" >> ./common/arch/arm64/configs/gki_defconfig
225-
echo "CONFIG_KSU_SUSFS_SUS_SU=n" >> ./common/arch/arm64/configs/gki_defconfig
215+
# echo "CONFIG_KSU_SUSFS=y" >> ./common/arch/arm64/configs/gki_defconfig
216+
# echo "CONFIG_KSU_SUSFS_HAS_MAGIC_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
217+
# echo "CONFIG_KSU_SUSFS_SUS_PATH=y" >> ./common/arch/arm64/configs/gki_defconfig
218+
# echo "CONFIG_KSU_SUSFS_SUS_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
219+
# echo "CONFIG_KSU_SUSFS_AUTO_ADD_SUS_KSU_DEFAULT_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
220+
# echo "CONFIG_KSU_SUSFS_AUTO_ADD_SUS_BIND_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
221+
# echo "CONFIG_KSU_SUSFS_SUS_KSTAT=y" >> ./common/arch/arm64/configs/gki_defconfig
222+
# echo "CONFIG_KSU_SUSFS_SUS_OVERLAYFS=n" >> ./common/arch/arm64/configs/gki_defconfig
223+
# echo "CONFIG_KSU_SUSFS_TRY_UMOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
224+
# echo "CONFIG_KSU_SUSFS_AUTO_ADD_TRY_UMOUNT_FOR_BIND_MOUNT=y" >> ./common/arch/arm64/configs/gki_defconfig
225+
# echo "CONFIG_KSU_SUSFS_SPOOF_UNAME=y" >> ./common/arch/arm64/configs/gki_defconfig
226+
# echo "CONFIG_KSU_SUSFS_ENABLE_LOG=y" >> ./common/arch/arm64/configs/gki_defconfig
227+
# echo "CONFIG_KSU_SUSFS_HIDE_KSU_SUSFS_SYMBOLS=y" >> ./common/arch/arm64/configs/gki_defconfig
228+
# echo "CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y" >> ./common/arch/arm64/configs/gki_defconfig
229+
# echo "CONFIG_KSU_SUSFS_OPEN_REDIRECT=y" >> ./common/arch/arm64/configs/gki_defconfig
230+
# echo "CONFIG_KSU_SUSFS_SUS_SU=n" >> ./common/arch/arm64/configs/gki_defconfig
226231
227232
# Add additional tmpfs config setting
228233
echo "CONFIG_TMPFS_XATTR=y" >> ./common/arch/arm64/configs/gki_defconfig

0 commit comments

Comments
 (0)