Revert "feat: Enable BTF config for kernel BPF CORE (deepin-community#34

)" This reverts commit 2b71e9b.
opsiff · Nov 3, 2023 · 9944144 · 9944144
1 parent 4663a9c
commit 9944144
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 5 deletions.
diff --git a/arch/arm64/configs/deepin_arm_desktop_defconfig b/arch/arm64/configs/deepin_arm_desktop_defconfig
@@ -3387,7 +3387,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=4
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_SECTION_MISMATCH=y

diff --git a/arch/x86/configs/deepin_desktop_common_defconfig b/arch/x86/configs/deepin_desktop_common_defconfig
@@ -5625,7 +5625,6 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DEBUG_MISC is not set
 CONFIG_DEBUG_INFO_DWARF4=y
-CONFIG_DEBUG_INFO_BTF=y
 CONFIG_GDB_SCRIPTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_STACK_VALIDATION=y

diff --git a/arch/x86/configs/deepin_desktop_laptop_defconfig b/arch/x86/configs/deepin_desktop_laptop_defconfig
@@ -5627,7 +5627,6 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_DEBUG_MISC is not set
 CONFIG_DEBUG_INFO_DWARF4=y
-CONFIG_DEBUG_INFO_BTF=y
 CONFIG_GDB_SCRIPTS=y
 CONFIG_FRAME_WARN=1024
 CONFIG_STACK_VALIDATION=y

diff --git a/debian/control b/debian/control
@@ -3,7 +3,7 @@ Section: kernel
 Priority: optional
 Maintainer: matrix <matrix@matrix-PC>
 Rules-Requires-Root: no
-Build-Depends: zstd, bc, debhelper, rsync, kmod, cpio, bison, flex, libelf-dev:native, libssl-dev:native, openssl, libelf-dev, pahole
+Build-Depends: zstd, bc, debhelper, rsync, kmod, cpio, bison, flex, libelf-dev:native, libssl-dev:native, openssl
 Homepage: https://www.kernel.org/
 
 Package: linux-image-6.5.4

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
@@ -215,7 +215,7 @@ Section: kernel
 Priority: optional
 Maintainer: $maintainer
 Rules-Requires-Root: no
-Build-Depends: zstd, bc, debhelper, rsync, kmod, cpio, bison, flex, libelf-dev:native, libssl-dev:native, openssl, libelf-dev, pahole
+Build-Depends: zstd, bc, debhelper, rsync, kmod, cpio, bison, flex, libelf-dev:native, libssl-dev:native, openssl
 Homepage: https://www.kernel.org/
 
 Package: $packagename-$version