From b51ecbc8e685cabb33fa49e8681ce6402c85ce49 Mon Sep 17 00:00:00 2001
From: ebasov <eduard.basov@softline.com>
Date: Fri, 14 Feb 2025 17:16:53 +0300
Subject: [PATCH] Fix build/Add more options

---
 SOURCES/config-6.1.124-x86_64-kasan    | 4 +++-
 SOURCES/config-6.1.124-x86_64-kmemleak | 4 +++-
 SPECS/kernel-6.1.spec                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/SOURCES/config-6.1.124-x86_64-kasan b/SOURCES/config-6.1.124-x86_64-kasan
index b73a732..e06e8a6 100644
--- a/SOURCES/config-6.1.124-x86_64-kasan
+++ b/SOURCES/config-6.1.124-x86_64-kasan
@@ -8423,6 +8423,9 @@ CONFIG_DEBUG_MISC=y
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_PAHOLE_HAS_BTF_AXE=y
+CONFIG_PAHOLE=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
@@ -8431,7 +8434,6 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_BTF is not set
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
 CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 CONFIG_GDB_SCRIPTS=y
diff --git a/SOURCES/config-6.1.124-x86_64-kmemleak b/SOURCES/config-6.1.124-x86_64-kmemleak
index 4111cbc..8a0f3ac 100644
--- a/SOURCES/config-6.1.124-x86_64-kmemleak
+++ b/SOURCES/config-6.1.124-x86_64-kmemleak
@@ -8423,6 +8423,9 @@ CONFIG_DEBUG_MISC=y
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_PAHOLE_HAS_BTF_AXE=y
+CONFIG_PAHOLE=y
 CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
@@ -8431,7 +8434,6 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_BTF is not set
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y
 CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 CONFIG_GDB_SCRIPTS=y
diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec
index d2e2563..878e31a 100644
--- a/SPECS/kernel-6.1.spec
+++ b/SPECS/kernel-6.1.spec
@@ -774,7 +774,7 @@ BuildKernel() {
 
     %if %{with_bpftool}
     # Generate a vmlinux.h file.
-    bpftool btf dump file %{_builddir}/%{name}-%{version}/linux-%{KVERREL}${Variant:+-${Variant}}/vmlinux format c > tools/bpf/bpftool/vmlinux.h
+    bpftool btf dump file vmlinux format c > tools/bpf/bpftool/vmlinux.h
     RPM_VMLINUX_H=vmlinux.h
     %endif
     %endif