Skip to content

Commit 17d032a

Browse files
authored
Added support for older OnePlus missing OOS15 kernels. (WildKernels#224)
OP-ACE-RACE - 5.10.209 OP-NORD-4-CE - 5.15.149 OP10t - 5.10.226 OP13-PJZ - 6.6.30 -> OP13 - 6.6.30 fix: add missing endline in various manifests
1 parent 5a5f0fb commit 17d032a

21 files changed

Lines changed: 134 additions & 16 deletions

.github/actions/build-kernel/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ runs:
12571257
echo "Patching hmbird!"
12581258
HMBIRD_MODEL=$(echo "$OP_MODEL" | sed 's/-[0-9]\+\.[0-9]\+\.[0-9]\+$//')
12591259
case "$OP_MODEL" in
1260-
OP-ACE-5-ULTRA-6.6.50|OP-ACE-5-PRO-6.6.30|OP13-PJZ-6.6.30|OP13-CPH-6.6.56)
1260+
OP-ACE-5-ULTRA-6.6.50|OP-ACE-5-PRO-6.6.30|OP13-6.6.30|OP13-CPH-6.6.56)
12611261
FENGCHI_DIR="$KERNEL_PATCHES_FOLDER/oneplus/hmbird/deprecated" ;;
12621262
*)
12631263
FENGCHI_DIR="$KERNEL_PATCHES_FOLDER/oneplus/hmbird" ;;
@@ -1344,7 +1344,7 @@ runs:
13441344
case "$OP_MODEL" in
13451345
OP10r|OP-ACE-2-5.10.209|OP-ACE-2V-5.10.209|OP-PAD-MT6983-5.10.209|\
13461346
OP10pro-5.10.209|OP10t-5.10.209|OP-ACE-5.10.209|OP11r-5.10.209|\
1347-
OP-NORD-3-5.10.209)
1347+
OP-NORD-3-5.10.209|OP-ACE-RACE-5.10.209)
13481348
if [[ "$OP_OS_VERSION" == "OOS15" ]]; then
13491349
NTSYNC_PATCH="$NTSYNC_FOLDER/ntsync_compat_android12-5.10_OOS14.patch"
13501350
fi
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"model": "OP-ACE-RACE-5.10.209",
3+
"soc": "dimensity8000",
4+
"branch": "wild/mt6895",
5+
"manifest": "oneplus_ace_race_5.10.209_v.xml",
6+
"android_version": "android12",
7+
"kernel_version": "5.10",
8+
"os_version": "OOS15",
9+
"lto": "thin",
10+
"zyc_compiler": "",
11+
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",
12+
"rust_compiler": "",
13+
"bindgen": "",
14+
"rust_build": false,
15+
"disk_cleanup": false,
16+
"hmbird": false,
17+
"susfs": true,
18+
"ds": true,
19+
"bbg": true,
20+
"bbr": true,
21+
"ttl": true,
22+
"ip_set": true,
23+
"unicode": true,
24+
"ntsync": true,
25+
"uname": "OP-WILD"
26+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"model": "OP-NORD-4-CE-5.15.149",
3+
"soc": "crow",
4+
"branch": "wild/sm7550",
5+
"manifest": "oneplus_nord_ce4_5.15.149_v.xml",
6+
"android_version": "android13",
7+
"kernel_version": "5.15",
8+
"os_version": "OOS15",
9+
"lto": "thin",
10+
"zyc_compiler": "",
11+
"c_compiler": "kernel_platform/prebuilts/clang/host/linux-x86/clang-r450784e/bin",
12+
"rust_compiler": "",
13+
"bindgen": "",
14+
"rust_build": false,
15+
"disk_cleanup": false,
16+
"hmbird": false,
17+
"susfs": true,
18+
"ds": true,
19+
"bbg": true,
20+
"bbr": true,
21+
"ttl": true,
22+
"ip_set": true,
23+
"unicode": true,
24+
"ntsync": true,
25+
"uname": "OP-WILD"
26+
}

configs/oos15/OP10t-5.10.226.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"model": "OP10t-5.10.226",
3+
"soc": "waipio",
4+
"branch": "wild/sm8475",
5+
"manifest": "oneplus_10t_5.10.226_v.xml",
6+
"android_version": "android12",
7+
"kernel_version": "5.10",
8+
"os_version": "OOS15",
9+
"lto": "thin",
10+
"zyc_compiler": "",
11+
"c_compiler": "kernel_platform/prebuilts-master/clang/host/linux-x86/clang-r416183c/bin",
12+
"rust_compiler": "",
13+
"bindgen": "",
14+
"rust_build": false,
15+
"disk_cleanup": false,
16+
"hmbird": false,
17+
"susfs": true,
18+
"ds": true,
19+
"bbg": true,
20+
"bbr": true,
21+
"ttl": true,
22+
"ip_set": true,
23+
"unicode": true,
24+
"ntsync": true,
25+
"uname": "OP-WILD"
26+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"model": "OP13-PJZ-6.6.30",
2+
"model": "OP13-6.6.30",
33
"soc": "sun",
44
"branch": "wild/sm8750",
55
"manifest": "oneplus_13_6.6.30_v.xml",

manifests/oos14/oneplus_ace_race_u.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<project remote="origin" name="android_vendor_mediatek_kernel_modules_mt6895" path="./" revision="oneplus/mt6895_u_14.0.0_ace_race"/>
1212
<project remote="clo" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="10ab783184f77d3ea15bf666426a7138b0f62bfc" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
1313
<project remote="clo" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts-master/clang/host/linux-x86" revision="0fc3d01a780023469b7acc18c56a9cf5099a6d6c" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
14-
</manifest>
14+
</manifest>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<manifest>
3+
<remote fetch="https://git.codelinaro.org/clo/la" name="clo" review="codelinaro.org"/>
4+
<default remote="clo" revision="kernel.build.lnx.1.0" sync-j="8"/>
5+
<remote fetch="https://github.com/OnePlusOSS" name="origin"/>
6+
<remote fetch="https://github.com/WildKernels" name="wild"/>
7+
<project remote="wild" name="AnyKernel3" path="AnyKernel3" revision="d1ebdc2002c557ceff9939afc3098eb88916f464"/>
8+
<project remote="origin" name="android_kernel_common_oneplus_sm8475" path="kernel_platform/common" revision="45235533105840dc875a80e9d5b4cd881e453472"/>
9+
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8475" path="./" revision="5c42d6d140632426dc74310b26645148e2d7ed78"/>
10+
<project remote="clo" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="10ab783184f77d3ea15bf666426a7138b0f62bfc" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
11+
<project remote="clo" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts-master/clang/host/linux-x86" revision="0fc3d01a780023469b7acc18c56a9cf5099a6d6c" upstream="refs/heads/ks-kernel.lnx.1.0.r1-rel"/>
12+
</manifest>

manifests/oos15/oneplus_11_5.15.149_v.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8550" path="./" revision="57664e711cd1e284f91fe907feb45db790d8e452"/>
1212
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="a27755ba41db8a1487c7d2ac7d0da22ec5e593c7" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
1313
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="c420e3ab93e51a2f2ab4f8e8b517463c34a7e8bd" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
14-
</manifest>
14+
</manifest>

manifests/oos15/oneplus_11_v.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8550" path="./" revision="oneplus/sm8550_v_15.0.0_oneplus11"/>
1212
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="a27755ba41db8a1487c7d2ac7d0da22ec5e593c7" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
1313
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="c420e3ab93e51a2f2ab4f8e8b517463c34a7e8bd" upstream="refs/heads/ks-kernel.lnx.2.0.r1-rel"/>
14-
</manifest>
14+
</manifest>

manifests/oos15/oneplus_13s_v.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<project remote="origin" name="android_kernel_modules_and_devicetree_oneplus_sm8750" path="./" revision="oneplus/sm8750_v_15.0.2_oneplus_13s"/>
1212
<project remote="clo-la" name="kernel/prebuilts/build-tools" path="kernel_platform/prebuilts/kernel-build-tools" revision="434f141b6d22a773a163fa9c707b19b4d254d989" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel" groups="ddk"/>
1313
<project remote="clo-la" name="kernelplatform/prebuilts-master/clang/host/linux-x86" path="kernel_platform/prebuilts/clang/host/linux-x86" revision="b099698c583b8361ca771f3cc8d6af6f729f39b3" upstream="refs/heads/ks-kernel.lnx.4.0.r1-rel" groups="ddk"/>
14-
</manifest>
14+
</manifest>

0 commit comments

Comments
 (0)