summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-30 00:26:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-30 11:31:09 +0100
commit6c6dc194679ec907b77e4d792176ac0b84eaa38d (patch)
tree67412e22966babe111ef8873fa495c3d7db7737e
parentb4d63248f0a6767bd1e518e5a0995873f9fe0757 (diff)
downloadpoky-6c6dc194679ec907b77e4d792176ac0b84eaa38d.tar.gz
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] (From OE-Core rev: a4ad6c88b683b7310ef46d89b1add80b0f41bf2d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch26
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc1
2 files changed, 27 insertions, 0 deletions
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 @@
1From ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470 Mon Sep 17 00:00:00 2001
2From: Du Zhe <duzhe0211+sourceware@gmail.com>
3Date: Tue, 13 Jul 2021 19:11:55 -0400
4Subject: [PATCH] runtime: fix unintended compile error with
5 autoconf-x86-uniregs.c
6
7Adding a #include <linux/sched.h> restores this test on the gentoo
8linux-5.10.47-gentoo kernel.
9
10Upstream-Status: Backport
11---
12 runtime/linux/autoconf-x86-uniregs.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/runtime/linux/autoconf-x86-uniregs.c b/runtime/linux/autoconf-x86-uniregs.c
16index 25729c220..232c18670 100644
17--- a/runtime/linux/autoconf-x86-uniregs.c
18+++ b/runtime/linux/autoconf-x86-uniregs.c
19@@ -1,3 +1,4 @@
20+#include <linux/sched.h>
21 #include <asm/ptrace.h>
22
23 #if defined (__i386__) || defined (__x86_64__)
24--
252.27.0
26
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 \
7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ 7 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
8 file://0001-Install-python-modules-to-correct-library-dir.patch \ 8 file://0001-Install-python-modules-to-correct-library-dir.patch \
9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ 9 file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
10 file://ef5a8b9eda402e4e96c4e3ce01e7ff95d3e10470.patch \
10 " 11 "
11 12
12COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' 13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux'