[SRU][FOCAL][PATCH] UBUNTU: [Config] Enable CONFIG_DEBUG_INFO_BTF on all arches

[Dimitri John Ledkov]

New backport of pahole is now available in focal & bionic (and
builders extra ppa) that works with new enough kernels, thus it is now
possible to enable CONFIG_DEBUG_INFO_BTF on all arches for the v5.4
based kernels.

BugLink: https://bugs.launchpad.net/bugs/1945632
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 debian.master/config/annotations          | 3 +--
 debian.master/config/config.common.ubuntu | 2 +-
 debian.master/control.stub.in             | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b23d62dbd7..93a50ca6ac 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10593,12 +10593,11 @@ CONFIG_DEBUG_INFO                               policy<{'amd64': 'y', 'arm64': '
 CONFIG_DEBUG_INFO_REDUCED                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DEBUG_INFO_SPLIT                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DEBUG_INFO_DWARF4                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_DEBUG_INFO_BTF                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_DEBUG_INFO_BTF                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_GDB_SCRIPTS                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 #
 CONFIG_DEBUG_INFO                               mark<ENFORCED> note<required for debug packages>
 CONFIG_DEBUG_INFO_SPLIT                         note<LP:1413646 and LP:1413664>
-CONFIG_DEBUG_INFO_BTF                           flag<REVIEW> note<Might be useful for bpf, reuquires pahole to build>
 
 # Menu: Kernel hacking >> CoreSight Tracing Support
 CONFIG_CORESIGHT                                policy<{'arm64': 'n', 'armhf': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c6bb6db066..c1f619717d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2319,7 +2319,7 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 47ddd5418a..a597bcaa4d 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -38,6 +38,7 @@ Build-Depends:
  dkms <!stage1>,
  curl <!stage1>,
  lz4 [amd64 s390x] <!stage1>,
+ dwarves [amd64 arm64 armhf ppc64el s390x] <!stage1>,
 Build-Depends-Indep:
  xmlto <!stage1>,
  docbook-utils <!stage1>,
-- 
2.32.0