Fix build/Add more options

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

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

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