cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "linux-kernel: disable BTF on 32-bit platforms on kernels 5.15+"

Browse source 
This reverts commit 79e05fb16b.

broken 32bit BTF builds got fixed in #175467 by switching libbpf from
libelf to elfutils, as a side-product of the upgrade, so we don't need
this anymore.
This commit is contained in:
Dominique Martinet 2022-07-11 10:14:06 +09:00
parent 0dc7730340
commit 4b4576faf9
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -44,8 +44,7 @@ let
# Reduced debug info conflict with BTF and have been enabled in # Reduced debug info conflict with BTF and have been enabled in
# aarch64 defconfig since 5.13 # aarch64 defconfig since 5.13
DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no); DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no);
# Disabled on 32-bit platforms, fails to build on 5.15+ with `Failed to parse base BTF 'vmlinux': -22` DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes);
DEBUG_INFO_BTF = whenAtLeast "5.2" (option (if stdenv.hostPlatform.is32bit && (versionAtLeast version "5.15") then no else yes));
BPF_LSM = whenAtLeast "5.7" (option yes); BPF_LSM = whenAtLeast "5.7" (option yes);
DEBUG_KERNEL = yes; DEBUG_KERNEL = yes;
DEBUG_DEVRES = no; DEBUG_DEVRES = no;