Skip to content

Commit 0e656b8

Browse files
fatalcoder524fatalcoder524
committed
Add OnePlus 13 and OnePlus Ace 5 Pro Support
1 parent 23a061c commit 0e656b8

File tree

2 files changed

+94
-60
lines changed

2 files changed

+94
-60
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,7 +84,41 @@ jobs:
9484
manifest: "oneplus_ace2pro_v.xml"
9585
android_version: "android13"
9686
kernel_version: "5.15"
87+
build-kernel-op12:
88+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
89+
uses: ./.github/workflows/build.yml
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+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
100+
uses: ./.github/workflows/build.yml
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+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
111+
uses: ./.github/workflows/build.yml
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:
121+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
98122
uses: ./.github/workflows/build.yml
99123
secrets: inherit
100124
with:
@@ -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:
132+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
108133
uses: ./.github/workflows/build.yml
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:
143+
needs: [build-kernel-op11, build-kernel-op11r, build-kernel-opopen, build-kernel-opace2, build-kernel-op10t, build-kernel-op10pro, build-kernel-opace2pro]
118144
uses: ./.github/workflows/build.yml
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: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ jobs:
9292
cd "$CONFIG/kernel_platform"
9393
9494
echo "Adding KernelSU..."
95-
curl -LSs "https://raw.githubusercontent.com/rifsxd/KernelSU-Next/next/kernel/setup.sh" | bash -s next
96-
#cd ./KernelSU-Next/kernel
97-
#sed -i 's/ccflags-y += -DKSU_VERSION=16/ccflags-y += -DKSU_VERSION=12000/' ./Makefile
98-
KSU_VERSION=$(cd ./KernelSU-Next/kernel && git describe --tags --abbrev=0)
99-
echo "KSUVER=${KSU_VERSION}" >> $GITHUB_ENV
95+
curl -LSs "https://raw.githubusercontent.com/KernelSU-Next/KernelSU-Next/next/kernel/setup.sh" | bash -s next
96+
97+
git submodule update --init --recursive
98+
cd KernelSU-Next/kernel
99+
KSU_VERSION=$(expr $(/usr/bin/git rev-list --count HEAD) "+" 10200)
100+
echo "KSUVER=$KSU_VERSION" >> $GITHUB_ENV
101+
sed -i "s/DKSU_VERSION=11998/DKSU_VERSION=${KSU_VERSION}/" Makefile
100102
101103
- name: Apply SUSFS Patches
102104
run: |
@@ -109,7 +111,7 @@ jobs:
109111
cp ../../susfs4ksu/kernel_patches/50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch ./common/
110112
cp ../../susfs4ksu/kernel_patches/fs/* ./common/fs/
111113
cp ../../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
112-
114+
113115
cd ./KernelSU-Next
114116
115117
echo "Applying next SUSFS patches..."
@@ -118,6 +120,9 @@ jobs:
118120
119121
# Change to common directory and apply SUSFS patch
120122
cd ../common
123+
if [ "${{ inputs.soc }}" == "sun" ]; then
124+
sed -i '/#include <trace\/hooks\/blk.h>/a #include <trace/hooks/fs.h>' ./fs/namespace.c
125+
fi
121126
patch -p1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
122127
123128
- name: Apply KSU Hooks
@@ -210,18 +215,19 @@ jobs:
210215
#git config --global user.name "TheWildJames"
211216
#git add *
212217
#git commit -s -a -m "getting rid of -dirty"
218+
219+
BUILD_TYPE="gki"
220+
BAZEL_ARGS=(--jobs=$(nproc --all) --verbose_failures --lto=thin)
221+
if [ "${{ inputs.soc }}" == "sun" ]; then
222+
BUILD_TYPE="perf"
223+
BAZEL_ARGS+=(-g)
224+
fi
225+
213226
if [ -f ./kernel_platform/build_with_bazel.py ]; then
214-
./kernel_platform/build_with_bazel.py \
215-
-t ${{ inputs.soc }} \
216-
gki \
217-
--jobs=$(nproc --all) \
218-
--verbose_failures \
219-
--config=stamp \
220-
--user_kmi_symbol_lists=//msm-kernel:android/abi_gki_aarch64_qcom \
221-
--ignore_missing_projects \
222-
-o "$(pwd)/out"
227+
./kernel_platform/oplus/bazel/oplus_modules_variant.sh ${{ inputs.soc }} "$BUILD_TYPE" ""
228+
./kernel_platform/build_with_bazel.py -t ${{ inputs.soc }} "$BUILD_TYPE" "${BAZEL_ARGS[@]}" -o "$(pwd)/out"
223229
else
224-
./kernel_platform/oplus/build/oplus_build_kernel.sh ${{ inputs.soc }} gki
230+
LTO=thin ./kernel_platform/oplus/build/oplus_build_kernel.sh ${{ inputs.soc }} "$BUILD_TYPE"
225231
fi
226232
227233
- name: Copy Images

0 commit comments

Comments
 (0)