Explorar el Código

Refactor BBR configuration addition method

Replaced inline configuration additions with script commands to enable/disable TCP congestion control options in the defconfig.
jimsterino98 hace 1 mes
padre
commit
57490713b2
Se han modificado 1 ficheros con 12 adiciones y 17 borrados
  1. 12 17
      .github/actions/bbrv3/action.yml

+ 12 - 17
.github/actions/bbrv3/action.yml

@@ -20,20 +20,15 @@ runs:
   - name: add bbr configs to defconfig
     shell: bash
     run: |
-     cat >> "$GKI_DEFCONFIG" << 'EOF'
-     # Add bbrv3
-     CONFIG_NET_SCH_FQ=y
-     CONFIG_NET_SCH_FQ_CODEL=y
-     CONFIG_NET_SCH_CAKE=y
-     CONFIG_NET_SCH_PIE=y
-     CONFIG_NET_SCH_FQ_PIE=y
-     CONFIG_TCP_CONG_ADVANCED=y
-     CONFIG_TCP_CONG_BBR=y
-     CONFIG_TCP_CONG_BBR3=y
-     CONFIG_TCP_CONG_CUBIC=y
-     CONFIG_DEFAULT_BBR3=y
-     
-     # CONFIG_TCP_CONG_BIC is not set
-     # CONFIG_TCP_CONG_WESTWOOD is not set
-     # CONFIG_TCP_CONG_HTCP is not set
-     EOF
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NET_SCH_FQ
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NET_SCH_FQ_CODEL
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NET_SCH_CAKE
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NET_SCH_PIE
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_NET_SCH_FQ_PIE
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_TCP_CONG_ADVANCED
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_TCP_CONG_BBR
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_TCP_CONG_BBR3
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --enable CONFIG_TCP_CONG_CUBIC
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --disable CONFIG_TCP_CONG_BIC
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --disable CONFIG_TCP_CONG_WESTWOOD
+     "$COMMON/scripts/config" --file "$GKI_DEFCONFIG" --disable CONFIG_TCP_CONG_HTCP