Browse Source

btf: disable android12-5.10 workaround fixes, keep CONFIG_DEBUG_INFO_BTF

Set if: false on all six fix steps in the btf action (libbpf feature
detection, resolve_btfids linker flags, xdp_buff BTF-emit, ELF_T_WORD
endian, host dd, apt pahole wrapper). The Enable BTF Config step stays
active so BTF generation still runs with stock in-tree tooling — a
baseline to see which fixes are actually load-bearing.
TheWildJames 1 month ago
parent
commit
75f7a12cc2
1 changed files with 6 additions and 6 deletions
  1. 6 6
      .github/actions/btf/action.yml

+ 6 - 6
.github/actions/btf/action.yml

@@ -17,7 +17,7 @@ runs:
     - name: Apply libbpf feature-detection fix (android12-5.10)
     - name: Apply libbpf feature-detection fix (android12-5.10)
       shell: bash
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       working-directory: ${{ github.workspace }}/kernel/common
-      if: ${{ inputs.version == 'android12-5.10' }}
+      if: false
       run: |
       run: |
         set -euo pipefail
         set -euo pipefail
         patch -p1 -N < ${{ github.action_path }}/patches/0001-libbpf-remove-feature-detection-BTF.patch
         patch -p1 -N < ${{ github.action_path }}/patches/0001-libbpf-remove-feature-detection-BTF.patch
@@ -25,7 +25,7 @@ runs:
     - name: Apply resolve_btfids linker-flag fix (android12-5.10)
     - name: Apply resolve_btfids linker-flag fix (android12-5.10)
       shell: bash
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       working-directory: ${{ github.workspace }}/kernel/common
-      if: ${{ inputs.version == 'android12-5.10' }}
+      if: false
       run: |
       run: |
         set -euo pipefail
         set -euo pipefail
         patch -p1 -N < ${{ github.action_path }}/patches/0002-resolve_btfids-inherit-host-linker-flags.patch
         patch -p1 -N < ${{ github.action_path }}/patches/0002-resolve_btfids-inherit-host-linker-flags.patch
@@ -33,7 +33,7 @@ runs:
     - name: Apply xdp_buff BTF-emit fix (android12-5.10)
     - name: Apply xdp_buff BTF-emit fix (android12-5.10)
       shell: bash
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       working-directory: ${{ github.workspace }}/kernel/common
-      if: ${{ inputs.version == 'android12-5.10' }}
+      if: false
       run: |
       run: |
         set -euo pipefail
         set -euo pipefail
         # bpf_types.h references struct xdp_buff via
         # bpf_types.h references struct xdp_buff via
@@ -51,7 +51,7 @@ runs:
     - name: Apply resolve_btfids ELF_T_WORD endian fix (android12-5.10)
     - name: Apply resolve_btfids ELF_T_WORD endian fix (android12-5.10)
       shell: bash
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       working-directory: ${{ github.workspace }}/kernel/common
-      if: ${{ inputs.version == 'android12-5.10' }}
+      if: false
       run: |
       run: |
         set -euo pipefail
         set -euo pipefail
         # Backport of upstream 61e8aeda9398 ("bpf: Fix libelf endian handling
         # Backport of upstream 61e8aeda9398 ("bpf: Fix libelf endian handling
@@ -72,7 +72,7 @@ runs:
     - name: Expose host dd for hermetic BTF generation (android12-5.10)
     - name: Expose host dd for hermetic BTF generation (android12-5.10)
       shell: bash
       shell: bash
       working-directory: ${{ github.workspace }}/kernel/common
       working-directory: ${{ github.workspace }}/kernel/common
-      if: ${{ inputs.version == 'android12-5.10' }}
+      if: false
       run: |
       run: |
         set -euo pipefail
         set -euo pipefail
         # The hermetic toolchain PATH (build.config.common -> HERMETIC_TOOLCHAIN=1)
         # The hermetic toolchain PATH (build.config.common -> HERMETIC_TOOLCHAIN=1)
@@ -88,7 +88,7 @@ runs:
     - name: Use apt pahole (>=1.23) for hermetic BTF generation (android12-5.10)
     - name: Use apt pahole (>=1.23) for hermetic BTF generation (android12-5.10)
       shell: bash
       shell: bash
       working-directory: ${{ github.workspace }}/kernel
       working-directory: ${{ github.workspace }}/kernel
-      if: ${{ inputs.version == 'android12-5.10' }}
+      if: false
       run: |
       run: |
         set -euo pipefail
         set -euo pipefail
         # android12-5.10 pins prebuilt pahole v1.19, which fails to recode the
         # android12-5.10 pins prebuilt pahole v1.19, which fails to recode the