Skip to content

Commit 9bb3d63

Browse files
committed
Add NET_SCH_CAKE support
1 parent 3ece1b6 commit 9bb3d63

1 file changed

Lines changed: 20 additions & 2 deletions

File tree

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,10 @@ runs:
723723
else
724724
echo "⚠️ No existing LTO cache - linker will generate new artifacts"
725725
fi
726+
727+
# Blacklist Risky files from ccache and ldcache
728+
# sed -i '1i // CI_RUN_ID: ${{ github.run_id }}' "$COMMON_KERNEL_FOLDER/kernel/configs.c"
729+
# sed -i '1i // ccache:disable' "$COMMON_KERNEL_FOLDER/kernel/configs.c"
726730
echo "::endgroup::"
727731
728732
- name: Fetch SusFS and Other Dependencies
@@ -1445,8 +1449,19 @@ runs:
14451449
cat >> "$COMMON_KERNEL_FOLDER/arch/arm64/configs/gki_defconfig" <<EOF
14461450
CONFIG_TCP_CONG_ADVANCED=y
14471451
CONFIG_TCP_CONG_BBR=y
1452+
EOF
1453+
1454+
- name: Enable Important Net Schedulers (qdisc)
1455+
shell: bash
1456+
run: |
1457+
set -euo pipefail
1458+
echo "Enable Important Net Schedulers (qdisc)"
1459+
cat >> "$COMMON_KERNEL_FOLDER/arch/arm64/configs/gki_defconfig" <<EOF
14481460
CONFIG_NET_SCH_FQ=y
14491461
CONFIG_NET_SCH_FQ_CODEL=y
1462+
CONFIG_NET_SCH_CAKE=y
1463+
CONFIG_NET_SCH_PIE=y
1464+
CONFIG_NET_SCH_FQ_PIE=y
14501465
EOF
14511466
14521467
- name: Apply BBRv3
@@ -1456,6 +1471,7 @@ runs:
14561471
echo "::group::Apply BBRv3 patches"
14571472
cd "$COMMON_KERNEL_FOLDER"
14581473
cat >> "$COMMON_KERNEL_FOLDER/arch/arm64/configs/gki_defconfig" <<EOF
1474+
CONFIG_TCP_CONG_ADVANCED=y
14591475
CONFIG_TCP_CONG_BBR3=y
14601476
EOF
14611477
PATCH_URL="https://raw.githubusercontent.com/fatalcoder524/kernel_patches_additional/refs/heads/main/bbr3/0001-net-tcp-backport-BBRv3-to-$ANDROID_VER-$KERNEL_VER.patch"
@@ -1519,7 +1535,7 @@ runs:
15191535
CONFIG_IP6_NF_TARGET_MASQUERADE=y
15201536
EOF
15211537
1522-
patch -p1 -F 3 < "$KERNEL_PATCHES_FOLDER/common/IPv6_NAT_FIX.patch"
1538+
# patch -p1 -F 3 < "$KERNEL_PATCHES_FOLDER/common/IPv6_NAT_FIX.patch"
15231539
15241540
- name: Add Droidspaces support
15251541
shell: bash
@@ -1638,6 +1654,7 @@ runs:
16381654
shell: bash
16391655
env:
16401656
PYTHONWARNINGS: "ignore:invalid escape sequence"
1657+
CCACHE_EXTRAFILES: "$COMMON_KERNEL_FOLDER/out/kernel/config_data.gz"
16411658
run: |
16421659
set -euo pipefail
16431660
echo "::group::Build kernel with ccache optimization"
@@ -1728,7 +1745,7 @@ runs:
17281745
17291746
make LD="$COMMON_KERNEL_FOLDER/ld-wrapper" HOSTLD="$COMMON_KERNEL_FOLDER/ld-wrapper" O="$OUT" gki_defconfig
17301747
1731-
LOCAL_LOCALVERSION="${CUSTOM_LOCALVERSION:--OP-WILD-BBRv3}"
1748+
LOCAL_LOCALVERSION="${CUSTOM_LOCALVERSION:--OP-WILD}"
17321749
if [ -n "${LOCAL_LOCALVERSION:-}" ]; then
17331750
scripts/config --file "$OUT/.config" --set-str LOCALVERSION "${LOCAL_LOCALVERSION}"
17341751
scripts/config --file "$OUT/.config" -d LOCALVERSION_AUTO || true
@@ -1995,6 +2012,7 @@ runs:
19952012
cp "$IMAGE_PATH" "$AK3_FOLDER/Image"
19962013
19972014
mv "${ARTIFACTS_FOLDER}/${OP_MODEL}_${OP_OS_VERSION}.txt" "$AK3_FOLDER/"
2015+
cp "$KERNEL_PLATFORM_FOLDER/out/$OP_ANDROID_VERSION-$OP_KERNEL_VERSION/dist/.config" "$AK3_FOLDER/" || true
19982016
cd "$AK3_FOLDER"
19992017
20002018
sed -i 's/do.check_boot_version=.*/do.check_boot_version=1/' anykernel.sh

0 commit comments

Comments
 (0)