Skip to content

Commit e8db21a

Browse files
committed
Add OnePlus 13 and OnePlus Ace 5 Pro Support
1 parent 8b22c61 commit e8db21a

File tree

2 files changed

+84
-47
lines changed

2 files changed

+84
-47
lines changed

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

Lines changed: 72 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,6 @@ jobs:
3434
manifest: "oneplus_11r_v.xml"
3535
android_version: "android13"
3636
kernel_version: "5.10"
37-
build-kernel-op12:
38-
uses: ./.github/workflows/build.yml
39-
secrets: inherit
40-
with:
41-
model: "OP12"
42-
soc: "pineapple"
43-
branch: "oneplus/sm8650"
44-
manifest: "oneplus12_v.xml"
45-
android_version: "android14"
46-
kernel_version: "6.1"
47-
build-kernel-op13r:
48-
uses: ./.github/workflows/build.yml
49-
secrets: inherit
50-
with:
51-
model: "OP13r"
52-
soc: "pineapple"
53-
branch: "oneplus/sm8650"
54-
manifest: "oneplus_13r.xml"
55-
android_version: "android14"
56-
kernel_version: "6.1"
57-
build-kernel-opnord4:
58-
uses: ./.github/workflows/build.yml
59-
secrets: inherit
60-
with:
61-
model: "OP-NORD-4"
62-
soc: "pineapple"
63-
branch: "oneplus/sm7675"
64-
manifest: "oneplus_nord_4_v.xml"
65-
android_version: "android14"
66-
kernel_version: "6.1"
6737
build-kernel-opopen:
6838
uses: ./.github/workflows/build.yml
6939
secrets: inherit
@@ -84,6 +54,26 @@ jobs:
8454
manifest: "oneplus_ace2_v.xml"
8555
android_version: "android13"
8656
kernel_version: "5.10"
57+
build-kernel-op10t:
58+
uses: ./.github/workflows/build.yml
59+
secrets: inherit
60+
with:
61+
model: "OP10t"
62+
soc: "waipio"
63+
branch: "oneplus/sm8475"
64+
manifest: "oneplus_10t_v.xml"
65+
android_version: "android12"
66+
kernel_version: "5.10"
67+
build-kernel-op10pro:
68+
uses: ./.github/workflows/build.yml
69+
secrets: inherit
70+
with:
71+
model: "OP10pro"
72+
soc: "waipio"
73+
branch: "oneplus/sm8450"
74+
manifest: "oneplus_10_pro_v.xml"
75+
android_version: "android12"
76+
kernel_version: "5.10"
8777
build-kernel-opace2pro:
8878
uses: ./.github/workflows/build.yml
8979
secrets: inherit
@@ -94,8 +84,42 @@ jobs:
9484
manifest: "oneplus_ace2pro_v.xml"
9585
android_version: "android13"
9686
kernel_version: "5.15"
87+
build-kernel-op12:
88+
uses: ./.github/workflows/build.yml
89+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
90+
secrets: inherit
91+
with:
92+
model: "OP12"
93+
soc: "pineapple"
94+
branch: "oneplus/sm8650"
95+
manifest: "oneplus12_v.xml"
96+
android_version: "android14"
97+
kernel_version: "6.1"
98+
build-kernel-op13r:
99+
uses: ./.github/workflows/build.yml
100+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
101+
secrets: inherit
102+
with:
103+
model: "OP13r"
104+
soc: "pineapple"
105+
branch: "oneplus/sm8650"
106+
manifest: "oneplus_13r.xml"
107+
android_version: "android14"
108+
kernel_version: "6.1"
109+
build-kernel-opnord4:
110+
uses: ./.github/workflows/build.yml
111+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
112+
secrets: inherit
113+
with:
114+
model: "OP-NORD-4"
115+
soc: "pineapple"
116+
branch: "oneplus/sm7675"
117+
manifest: "oneplus_nord_4_v.xml"
118+
android_version: "android14"
119+
kernel_version: "6.1"
97120
build-kernel-opace5:
98121
uses: ./.github/workflows/build.yml
122+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
99123
secrets: inherit
100124
with:
101125
model: "OP-ACE-5"
@@ -104,26 +128,28 @@ jobs:
104128
manifest: "oneplus_ace5.xml"
105129
android_version: "android14"
106130
kernel_version: "6.1"
107-
build-kernel-op10t:
131+
build-kernel-op13:
108132
uses: ./.github/workflows/build.yml
133+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
109134
secrets: inherit
110135
with:
111-
model: "OP10t"
112-
soc: "waipio"
113-
branch: "oneplus/sm8475"
114-
manifest: "oneplus_10t_v.xml"
115-
android_version: "android12"
116-
kernel_version: "5.10"
117-
build-kernel-op10pro:
136+
model: "OP13"
137+
soc: "sun"
138+
branch: "oneplus/sm8750"
139+
manifest: "JiuGeFaCai_oneplus_13_v.xml"
140+
android_version: "android15"
141+
kernel_version: "6.6"
142+
build-kernel-opace5pro:
118143
uses: ./.github/workflows/build.yml
144+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
119145
secrets: inherit
120146
with:
121-
model: "OP10pro"
122-
soc: "waipio"
123-
branch: "oneplus/sm8450"
124-
manifest: "oneplus_10_pro_v.xml"
125-
android_version: "android12"
126-
kernel_version: "5.10"
147+
model: "OPAce5Pro"
148+
soc: "sun"
149+
branch: "oneplus/sm8750"
150+
manifest: "JiuGeFaCai_oneplus_ace5_pro_v.xml"
151+
android_version: "android15"
152+
kernel_version: "6.6"
127153

128154
trigger-release:
129155
runs-on: ubuntu-latest
@@ -139,6 +165,8 @@ jobs:
139165
- build-kernel-opace5
140166
- build-kernel-op10t
141167
- build-kernel-op10pro
168+
- build-kernel-op13
169+
- build-kernel-opace5pro
142170
if: ${{ inputs.make_release }}
143171
env:
144172
REPO_OWNER: TheWildJames

.github/workflows/build.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
cp ../../susfs4ksu/kernel_patches/50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch ./common/
110110
cp ../../susfs4ksu/kernel_patches/fs/* ./common/fs/
111111
cp ../../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
112-
112+
113113
cd ./KernelSU-Next
114114
115115
echo "Applying next SUSFS patches..."
@@ -118,6 +118,9 @@ jobs:
118118
119119
# Change to common directory and apply SUSFS patch
120120
cd ../common
121+
if [ "${{ inputs.soc }}" == "sun" ]; then
122+
sed -i '/#include <trace\/hooks\/blk.h>/a #include <trace/hooks/fs.h>' ./fs/namespace.c
123+
fi
121124
patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
122125
123126
- name: Apply KSU Hooks
@@ -210,18 +213,24 @@ jobs:
210213
#git config --global user.name "TheWildJames"
211214
#git add *
212215
#git commit -s -a -m "getting rid of -dirty"
216+
217+
BUILD_TYPE="gki"
218+
if [ "${{ inputs.soc }}" == "sun" ]; then
219+
BUILD_TYPE="perf"
220+
fi
213221
if [ -f ./kernel_platform/build_with_bazel.py ]; then
214222
./kernel_platform/build_with_bazel.py \
215223
-t ${{ inputs.soc }} \
216-
gki \
224+
$BUILD_TYPE \
217225
--jobs=$(nproc --all) \
218226
--verbose_failures \
219227
--config=stamp \
220228
--user_kmi_symbol_lists=//msm-kernel:android/abi_gki_aarch64_qcom \
221229
--ignore_missing_projects \
230+
--lto=thin \
222231
-o "$(pwd)/out"
223232
else
224-
./kernel_platform/oplus/build/oplus_build_kernel.sh ${{ inputs.soc }} gki
233+
LTO=thin ./kernel_platform/oplus/build/oplus_build_kernel.sh ${{ inputs.soc }} $BUILD_TYPE
225234
fi
226235
227236
- name: Copy Images

0 commit comments

Comments
 (0)