From 873c6c9fadf324464e9590be4218451cff322e1d Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Tue, 15 Feb 2022 17:10:22 +0000 Subject: [PATCH] Disable libbfd buildid support, it seems to fail to build. --- debian/changelog | 3 ++ .../patches/perf-avoid-binutils-buildid.patch | 32 +++++++++++++++++++ debian/patches/series | 1 + tools/perf/util/symbol-elf.c | 6 ++-- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 debian/patches/perf-avoid-binutils-buildid.patch diff --git a/debian/changelog b/debian/changelog index 52e2f48a14d..a3af3241454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ linux (5.15.15-2+rpi1) bookworm-staging; urgency=medium [changes brought forward from 4.14.13-1+rpi1 by Peter Michael Green at Wed, 07 Feb 2018 23:32:32 +0000] * Disable kernel builds from this package, we build our kernels from other source packages. + [changes introduced in 5.15.15-2+rpi1 by Peter Michael Green] + * Disable libbfd buildid support, it seems to fail to build. + -- Peter Michael Green Sun, 13 Feb 2022 14:24:17 +0000 linux (5.15.15-2) unstable; urgency=high diff --git a/debian/patches/perf-avoid-binutils-buildid.patch b/debian/patches/perf-avoid-binutils-buildid.patch new file mode 100644 index 00000000000..bd05f2ecddd --- /dev/null +++ b/debian/patches/perf-avoid-binutils-buildid.patch @@ -0,0 +1,32 @@ +Description: Disable libbfd buildid support, it seems to fail to build. +Author: Peter Michael Green + +--- linux-5.15.15.orig/tools/perf/util/symbol-elf.c ++++ linux-5.15.15/tools/perf/util/symbol-elf.c +@@ -537,7 +537,7 @@ out: + return err; + } + +-#ifdef HAVE_LIBBFD_BUILDID_SUPPORT ++/*#ifdef HAVE_LIBBFD_BUILDID_SUPPORT + + static int read_build_id(const char *filename, struct build_id *bid) + { +@@ -566,7 +566,7 @@ out_close: + return err; + } + +-#else // HAVE_LIBBFD_BUILDID_SUPPORT ++#else // HAVE_LIBBFD_BUILDID_SUPPORT */ + + static int read_build_id(const char *filename, struct build_id *bid) + { +@@ -598,7 +598,7 @@ out: + return err; + } + +-#endif // HAVE_LIBBFD_BUILDID_SUPPORT ++//#endif // HAVE_LIBBFD_BUILDID_SUPPORT + + int filename__read_build_id(const char *filename, struct build_id *bid) + { diff --git a/debian/patches/series b/debian/patches/series index c9c555a10ae..83d13a1e475 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -129,3 +129,4 @@ bugfix/all/tools-include-uapi-fix-errno.h.patch bugfix/all/perf-srcline-Use-long-running-addr2line-per-DSO.patch # ABI maintenance +perf-avoid-binutils-buildid.patch diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 31cd59a2b66..2cf11d5a293 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -537,7 +537,7 @@ out: return err; } -#ifdef HAVE_LIBBFD_BUILDID_SUPPORT +/*#ifdef HAVE_LIBBFD_BUILDID_SUPPORT static int read_build_id(const char *filename, struct build_id *bid) { @@ -566,7 +566,7 @@ out_close: return err; } -#else // HAVE_LIBBFD_BUILDID_SUPPORT +#else // HAVE_LIBBFD_BUILDID_SUPPORT */ static int read_build_id(const char *filename, struct build_id *bid) { @@ -598,7 +598,7 @@ out: return err; } -#endif // HAVE_LIBBFD_BUILDID_SUPPORT +//#endif // HAVE_LIBBFD_BUILDID_SUPPORT int filename__read_build_id(const char *filename, struct build_id *bid) { -- 2.30.2