[SRU][f/aws-5.11][PATCH] UBUNTU: [Config] Re-enable CONFIG_DEBUG_INFO_BTF on all arches

[Dimitri John Ledkov]

New backport of pahole is now available that works with new enough
kernels, thus it is now possible to re-enable CONFIG_DEBUG_INFO_BTF on
all arches.

BugLink: https://bugs.launchpad.net/bugs/1945632
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 debian.aws-5.11/config/annotations           | 2 +-
 debian.aws-5.11/config/config.common.ubuntu  | 2 +-
 debian.aws-5.11/scripts/helpers/local-mangle | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/debian.aws-5.11/config/annotations b/debian.aws-5.11/config/annotations
index 98a3cb99b0..ac7a97792f 100644
--- a/debian.aws-5.11/config/annotations
+++ b/debian.aws-5.11/config/annotations
@@ -10245,6 +10245,7 @@ CONFIG_DEBUG_INFO_REDUCED                       policy<{'amd64': 'n', 'arm64': '
 CONFIG_DEBUG_INFO_COMPRESSED                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DEBUG_INFO_SPLIT                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DEBUG_INFO_DWARF4                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_DEBUG_INFO_BTF                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_GDB_SCRIPTS                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 #
 CONFIG_DEBUG_INFO                               mark<ENFORCED> note<required for debug packages>
@@ -13019,4 +13020,3 @@ CONFIG_APPLDATA_NET_SUM                         policy<{'s390x': 'm'}>
 
 #
 #
-CONFIG_DEBUG_INFO_BTF                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
diff --git a/debian.aws-5.11/config/config.common.ubuntu b/debian.aws-5.11/config/config.common.ubuntu
index a888d37a71..7f909c6b2a 100644
--- a/debian.aws-5.11/config/config.common.ubuntu
+++ b/debian.aws-5.11/config/config.common.ubuntu
@@ -2133,7 +2133,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_GPIO 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_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
diff --git a/debian.aws-5.11/scripts/helpers/local-mangle b/debian.aws-5.11/scripts/helpers/local-mangle
index 99b7255850..009d6e4069 100755
--- a/debian.aws-5.11/scripts/helpers/local-mangle
+++ b/debian.aws-5.11/scripts/helpers/local-mangle
@@ -5,15 +5,6 @@
 
 . debian/debian.env
 
-ANN=${DEBIAN}/config/annotations
-CFG=${DEBIAN}/config/config.common.ubuntu
-
-#
-# CONFIG_DEBUG_INFO_BTF requires /usr/bin/pahole v1.16 or higher. Focal only has v1.15.
-sed -i '/CONFIG_DEBUG_INFO_BTF/d' ${ANN}
-echo "CONFIG_DEBUG_INFO_BTF                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>" >> ${ANN}
-sed  -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${CFG}
-
 # Do not enforce CONFIG_ARM64_BTI_KERNEL in Focal, as it depends on a newer
 # gcc version. Note that the config itself is already removed in an earlier
 # stage when 'make' is run, updating config 'GCC_VERSION' and removing
-- 
2.30.2