[openwrt/openwrt] build: add option KERNEL_DEBUG_INFO_BTF_MODULES
LEDE Commits
lede-commits at lists.infradead.org
Fri May 31 14:50:47 PDT 2024
nick pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/ab9bb79d8e30a574c7628c73c4522429805d9307
commit ab9bb79d8e30a574c7628c73c4522429805d9307
Author: Tony Ambardar <itugrok at yahoo.com>
AuthorDate: Thu May 30 23:07:22 2024 -0700
build: add option KERNEL_DEBUG_INFO_BTF_MODULES
The recent kernel v6.6.31 update broke BTF-enabled builds since upstream
Linux added a prompt for config option DEBUG_INFO_BTF_MODULES in commit
2166cb2e21 ("bpf, kconfig: Fix DEBUG_INFO_BTF_MODULES Kconfig definition").
Fix by updating Config-kernel.in to add the option, cleaning up a related
dependency and whitespace also.
Fixes: 10d77b9bc3 ("kernel: bump 6.6 to 6.6.31")
Signed-off-by: Tony Ambardar <itugrok at yahoo.com>
---
config/Config-kernel.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 0acd320504..2d90abcfe8 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -435,7 +435,6 @@ config KERNEL_DEBUG_INFO
This will compile your kernel and modules with debug information.
config KERNEL_DEBUG_INFO_BTF
-
bool "Enable additional BTF type information"
depends on !HOST_OS_MACOS
depends on KERNEL_DEBUG_INFO && !KERNEL_DEBUG_INFO_REDUCED
@@ -447,9 +446,13 @@ config KERNEL_DEBUG_INFO_BTF
Required to run BPF CO-RE applications.
+config KERNEL_DEBUG_INFO_BTF_MODULES
+ def_bool y
+ depends on KERNEL_DEBUG_INFO_BTF
+
config KERNEL_MODULE_ALLOW_BTF_MISMATCH
bool "Allow loading modules with non-matching BTF type info"
- depends on KERNEL_DEBUG_INFO_BTF
+ depends on KERNEL_DEBUG_INFO_BTF_MODULES
help
For modules whose split BTF does not match vmlinux, load without
BTF rather than refusing to load. The default behavior with
More information about the lede-commits
mailing list