UBUNTU: [Config] Temporarily disable DEBUG_INFO_BTF for armhf

pahole is segfaulting on armhf. A fix is in progress, but in the
mean time disable BTF to get a working build.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 76fcdef5ac706cc535bba148e14f87bf7be25187..eb143b502207c63d0d7d39df9d42a5f43148f8b0 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -74,6 +74,7 @@ CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DMADEVICES=y

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5da5beed34627e9d0557d4e7b779966b9db18118..b4e5cf036d2438a945b84bc5f53c945fb2b28b24 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11144,12 +11144,12 @@ 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_DEBUG_INFO_BTF                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', '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>
 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>
+CONFIG_DEBUG_INFO_BTF                           flag<REVIEW> note<Needs newer pahole for armhf>
 
 # Menu: Kernel hacking >> Debug Oops, Lockups and Hangs
 CONFIG_PANIC_ON_OOPS                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index ba13d051e5a9d23d1cdefa5965766bc6b13a16d5..8797aa44c51791120619a49f10dad6accc2695f8 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -82,6 +82,7 @@ CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DMADEVICES=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 170efeff15d85c548cc487c4033698f55a026f67..467947a50cc37ddbc76fd997aaf45b5514d5a301 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -75,6 +75,7 @@ CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+# CONFIG_DEBUG_INFO_BTF is not set
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DMADEVICES=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index aef0e2aba3049270bc0a0244aa5ed1f107921c2b..e7592c1c52227c57a6809ba7a202d6b29c59ff6a 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2474,7 +2474,6 @@ 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

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index c24f33298438741410bb0fb290bbe4bbeb81922d..5504cb35b19c975ebee44c064e23a5665f5bf8f7 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -74,6 +74,7 @@ CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DECNET=m
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_DMADEVICES=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index abed23ceb827c43dfb45576ec0d924c617d36c4f..05fd8284e83666481c8b72c33c1e55c549ce475c 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -62,6 +62,7 @@ CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_DEBUG_INFO_BTF=y
 # CONFIG_DECNET is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DMADEVICES is not set