Skip to content

Commit 3de0886

Browse files
fatalcoder524fatalcoder524
committed
Test Fengchi Patch
1 parent 280e123 commit 3de0886

File tree

2 files changed

+96
-101
lines changed

2 files changed

+96
-101
lines changed

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

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -30,54 +30,54 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
include:
33-
- model: OP11
34-
soc: kalama
35-
branch: oneplus/sm8550
36-
manifest: oneplus_11_v.xml
37-
android_version: android13
38-
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: android12
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"
33+
# - model: OP11
34+
# soc: kalama
35+
# branch: oneplus/sm8550
36+
# manifest: oneplus_11_v.xml
37+
# android_version: android13
38+
# 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: android12
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"
8181
uses: ./.github/workflows/build.yml
8282
secrets: inherit
8383
with:
@@ -108,48 +108,48 @@ jobs:
108108
manifest: oneplus_ace5_pro.xml
109109
android_version: android15
110110
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-ACE-3V
130-
soc: pineapple
131-
branch: oneplus/sm7675
132-
manifest: oneplus_ace_3v_v.xml
133-
android_version: android14
134-
kernel_version: "6.1"
135-
- model: OP-NORD-4
136-
soc: pineapple
137-
branch: oneplus/sm7675
138-
manifest: oneplus_nord_4_v.xml
139-
android_version: android14
140-
kernel_version: "6.1"
141-
- model: OP-PAD-2
142-
soc: pineapple
143-
branch: oneplus/sm8650
144-
manifest: oneplus_pad2_v.xml
145-
android_version: android14
146-
kernel_version: "6.1"
147-
- model: OP13S
148-
soc: sun
149-
branch: oneplus/sm8750
150-
manifest: oneplus_13s.xml
151-
android_version: android15
152-
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-ACE-3V
130+
# soc: pineapple
131+
# branch: oneplus/sm7675
132+
# manifest: oneplus_ace_3v_v.xml
133+
# android_version: android14
134+
# kernel_version: "6.1"
135+
# - model: OP-NORD-4
136+
# soc: pineapple
137+
# branch: oneplus/sm7675
138+
# manifest: oneplus_nord_4_v.xml
139+
# android_version: android14
140+
# kernel_version: "6.1"
141+
# - model: OP-PAD-2
142+
# soc: pineapple
143+
# branch: oneplus/sm8650
144+
# manifest: oneplus_pad2_v.xml
145+
# android_version: android14
146+
# kernel_version: "6.1"
147+
# - model: OP13S
148+
# soc: sun
149+
# branch: oneplus/sm8750
150+
# manifest: oneplus_13s.xml
151+
# android_version: android15
152+
# kernel_version: "6.6"
153153
uses: ./.github/workflows/build.yml
154154
secrets: inherit
155155
with:

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,12 @@ jobs:
196196
else
197197
echo "Kernel >= $MIN_VERSION, skipping ptrace patch"
198198
fi
199+
200+
if [ "${{ inputs.model }}" == "OPAce5Pro" || "${{ inputs.model }}" == "OP13" ]; then
201+
curl -Ls https://github.com/schqiushui/android_kernel_common_oneplus_sm8750/commit/5d2cc9706a35f5e4b5dbbd5d247487225a46e02c.patch | patch -p1 -F 3
202+
else
203+
echo "Not OPAce5Pro / OP13, skipping fengchi patch"
204+
fi
199205
200206
- name: Apply KSUN Hooks
201207
run: |
@@ -359,12 +365,6 @@ jobs:
359365
360366
echo "Copying Image"
361367
cp ./out/dist/Image ../AnyKernel3/Image
362-
if [ "${{ inputs.model }}" == "OPAce5Pro" ]; then
363-
cp ./out/dist/dtbo.img ../AnyKernel3/
364-
cp ./out/dist/system_dlkm.erofs.img ../AnyKernel3/system_dlkm.img
365-
# cp ./out/dist/vendor_dlkm.img ../AnyKernel3/
366-
# cp ./out/dist/vendor_boot.img ../AnyKernel3/
367-
fi
368368
369369
- name: Create ZIP Files for Different Formats
370370
run: |
@@ -375,11 +375,6 @@ jobs:
375375
ZIP_NAME="${{ inputs.model }}_${{ inputs.android_version }}_${{ inputs.kernel_version }}_Next_SUSFS_AnyKernel3.zip"
376376
echo "Creating zip file $ZIP_NAME..."
377377
zip -r "../$ZIP_NAME" ./*
378-
# Fengchi Patch for OPAce5Pro
379-
if [ "${{ inputs.model }}" == "OPAce5Pro" ]; then
380-
sed -i 's/hmbird/xxbird/g' dtbo.img
381-
zip -r "../$ZIP_NAME-CN-version.zip" ./*
382-
fi
383378
384379
- name: Upload Build Artifacts
385380
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)