소스 검색

simplify BBRv3 patch application in networking action

- Remove unnecessary cp/rm temp.patch steps, apply patches directly
- Simplify version conditions by removing sublevel checks
- Use patch -p1 without -F 3 fallback limit
TheWildJames 2 달 전
부모
커밋
7dc9165ca5
1개의 변경된 파일10개의 추가작업 그리고 24개의 파일을 삭제
  1. 10 24
      .github/actions/networking/action.yml

+ 10 - 24
.github/actions/networking/action.yml

@@ -100,33 +100,19 @@ runs:
       run: |
         set -euo pipefail
         if [[ ${{ inputs.version }} == "android16-6.12" ]]; then
-          cp "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android15-6.6.patch" temp.patch
-          #patch -p1 -F 3 < temp.patch
-          rm temp.patch
+          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android15-6.6.patch"
         elif [[ ${{ inputs.version }} == "android15-6.6" ]]; then
-          cp "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android15-6.6.patch" temp.patch
-          patch -p1 -F 3 < temp.patch
-          rm temp.patch
+          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android15-6.6.patch"
         elif [[ ${{ inputs.version }} == "android14-6.1" ]]; then
-          cp "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android14-6.1.patch" temp.patch
-          patch -p1 -F 3 < temp.patch
-          rm temp.patch
+          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android14-6.1.patch"
         elif [[ ${{ inputs.version }} == "android14-5.15" ]]; then
-          cp "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android13-5.15.patch" temp.patch
-          patch -p1 -F 3 < temp.patch
-          rm temp.patch
-        elif [[ ${{ inputs.version }} == "android13-5.15" && ${{ inputs.sublevel }} -ge "74" ]]; then
-          cp "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android13-5.15.patch" temp.patch
-          patch -p1 -F 3 < temp.patch
-          rm temp.patch
-        elif [[ ${{ inputs.version }} == "android13-5.10" && ${{ inputs.sublevel }} -ge "186" ]]; then
-          cp "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android12-5.10.patch" temp.patch
-          patch -p1 -F 3 < temp.patch
-          rm temp.patch
-        elif [[ ${{ inputs.version }} == "android12-5.10" && ${{ inputs.sublevel }} -ge "185" ]]; then
-          cp "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android12-5.10.patch" temp.patch
-          patch -p1 -F 3 < temp.patch
-          rm temp.patch
+          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android13-5.15.patch"
+        elif [[ ${{ inputs.version }} == "android13-5.15" ]]; then
+          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android13-5.15.patch"
+        elif [[ ${{ inputs.version }} == "android13-5.10" ]]; then
+          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android12-5.10.patch"
+        elif [[ ${{ inputs.version }} == "android12-5.10" ]]; then
+          patch -p1 < "${{ github.workspace }}/kernel_patches/common/bbrv3/0001-net-tcp-backport-BBRv3-to-android12-5.10.patch"
         fi
 
         echo "✅ BBRv3 patches applied"