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

[Dimitri John Ledkov]

Correctly disable CONFIG_DEBUG_INFO_SPLIT as required by the
annotations note<LP:1413646 and LP:1413664>. Note that local-mangle of
this option to reduce disk usage did not achieve its goals, as dbg
symbol packages got disabled all together in 3eea89aa80 ("UBUNTU:
[Packaging] temporarily disable debugging packages")

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>
---

 Test built in LP completed successfully in
 https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4684/+packages

 debian.hwe-5.11/config/annotations           |  3 ++-
 debian.hwe-5.11/config/config.common.ubuntu  |  3 ++-
 debian.hwe-5.11/scripts/helpers/local-mangle | 12 ------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian.hwe-5.11/config/annotations b/debian.hwe-5.11/config/annotations
index ac8d62fddc..59eefb982f 100644
--- a/debian.hwe-5.11/config/annotations
+++ b/debian.hwe-5.11/config/annotations
@@ -11322,7 +11322,8 @@ CONFIG_STACK_VALIDATION                         mark<ENFORCED> note<needed for l
 CONFIG_DEBUG_INFO                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_DEBUG_INFO_REDUCED                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_DEBUG_INFO_COMPRESSED                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_DEBUG_INFO_SPLIT                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_DEBUG_INFO_SPLIT                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_DEBUG_INFO_BTF                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_DEBUG_INFO_DWARF4                        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'}>
 #
diff --git a/debian.hwe-5.11/config/config.common.ubuntu b/debian.hwe-5.11/config/config.common.ubuntu
index fb0022ac17..edcf717519 100644
--- a/debian.hwe-5.11/config/config.common.ubuntu
+++ b/debian.hwe-5.11/config/config.common.ubuntu
@@ -2513,10 +2513,11 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
 # CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
 CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 CONFIG_DEBUG_INFO_DWARF4=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
-CONFIG_DEBUG_INFO_SPLIT=y
+# CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KERNEL_DC is not set
 # CONFIG_DEBUG_KMAP_LOCAL is not set
diff --git a/debian.hwe-5.11/scripts/helpers/local-mangle b/debian.hwe-5.11/scripts/helpers/local-mangle
index 5ceb1c3203..dc74c8591c 100755
--- a/debian.hwe-5.11/scripts/helpers/local-mangle
+++ b/debian.hwe-5.11/scripts/helpers/local-mangle
@@ -30,18 +30,6 @@ sed -i 's/CONFIG_MARCH_Z15_TUNE=y/CONFIG_MARCH_Z13_TUNE=y/' ${DEBIAN}/config/con
 sed -i 's/CONFIG_SECURITY_DMESG_RESTRICT=y/# CONFIG_SECURITY_DMESG_RESTRICT is not set/' ${DEBIAN}/config/config.common.ubuntu
 sed -i "s/CONFIG_SECURITY_DMESG_RESTRICT                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>/CONFIG_SECURITY_DMESG_RESTRICT                  policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>/" ${DEBIAN}/config/annotations
 
-# Disable DEBUG_INFO_BTF (pahole version is too old in focal)
-sed -i "/CONFIG_DEBUG_INFO_BTF/d" ${DEBIAN}/config/annotations
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/amd64/config.common.amd64
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/arm64/config.common.arm64
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/armhf/config.common.armhf
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/ppc64el/config.common.ppc64el
-sed -i 's/CONFIG_DEBUG_INFO_BTF=y/# CONFIG_DEBUG_INFO_BTF is not set/' ${DEBIAN}/config/s390x/config.common.s390x
-
-# Enable DEBUG_INFO_SPLIT (required to save disk space during build)
-sed -i "s/CONFIG_DEBUG_INFO_SPLIT                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>/CONFIG_DEBUG_INFO_SPLIT                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>/" ${DEBIAN}/config/annotations
-sed -i 's/# CONFIG_DEBUG_INFO_SPLIT is not set/CONFIG_DEBUG_INFO_SPLIT=y/' ${DEBIAN}/config/config.common.ubuntu
-
 # And adjust annotations accordingly
 sed -i "s/CONFIG_KERNEL_LZ4                               policy<{'amd64': 'y', 'armhf': 'n', 's390x': 'y'}>/CONFIG_KERNEL_LZ4                               policy<{'amd64': 'n', 'armhf': 'n', 's390x': 'n'}>/" ${DEBIAN}/config/annotations
 sed -i "s/CONFIG_KERNEL_GZIP                              policy<{'amd64': 'n', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>/CONFIG_KERNEL_GZIP                              policy<{'amd64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}>/" ${DEBIAN}/config/annotations
-- 
2.30.2