From a4ad6c88b683b7310ef46d89b1add80b0f41bf2d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Jul 2021 00:26:03 +0100 Subject: systemtap: Fix headers issue with x86 and 5.13 headers On some x86 platforms there were header issues causing pt_regs compile failures for our stap tests, e.g. on genericx86-64 but not qemux86-64. Backport a patch from upstream which fixes the issue. [YOCTO #14491] Signed-off-by: Richard Purdie --- .../ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch | 26 ++++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.inc | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch (limited to 'meta') diff --git a/meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch b/meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch new file mode 100644 index 0000000000..4d044de7ee --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch @@ -0,0 +1,26 @@ +From ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470 Mon Sep 17 00:00:00 2001 +From: Du Zhe +Date: Tue, 13 Jul 2021 19:11:55 -0400 +Subject: [PATCH] runtime: fix unintended compile error with + autoconf-x86-uniregs.c + +Adding a #include restores this test on the gentoo +linux-5.10.47-gentoo kernel. + +Upstream-Status: Backport +--- + runtime/linux/autoconf-x86-uniregs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/runtime/linux/autoconf-x86-uniregs.c b/runtime/linux/autoconf-x86-uniregs.c +index 25729c220..232c18670 100644 +--- a/runtime/linux/autoconf-x86-uniregs.c ++++ b/runtime/linux/autoconf-x86-uniregs.c +@@ -1,3 +1,4 @@ ++#include + #include + + #if defined (__i386__) || defined (__x86_64__) +-- +2.27.0 + diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 23ecc61987..dc046a679c 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -7,6 +7,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ + file://ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' -- cgit 1.2.3-korg