summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/system_map_location.patch23
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch b/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch
new file mode 100644
index 0000000000..013af5c3a4
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch
@@ -0,0 +1,23 @@
1systemtap: Cross compilation fix
2
3This is a cross compilation fix. It allows systemtap to find
4the kernel map file in the right place, i.e. in the kernel build tree.
5Without this fix it takes a map file from the build host, if available.
6
7Upstream-Status: Pending
8
9Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
10
11Index: git/session.cxx
12===================================================================
13--- git.orig/session.cxx
14+++ git/session.cxx
15@@ -1634,7 +1634,7 @@ systemtap_session::parse_kernel_function
16 clog << _F("Kernel symbol table %s unavailable, (%s)",
17 system_map_path.c_str(), strerror(errno)) << endl;
18
19- system_map_path = "/boot/System.map-" + kernel_release;
20+ system_map_path = kernel_build_tree + "/System.map-" + kernel_release;
21 system_map.clear();
22 system_map.open(system_map_path.c_str(), ifstream::in);
23 if (! system_map.is_open())
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 3e1e80a727..33aa136f74 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -6,6 +6,7 @@ PV = "2.5+git${SRCPV}"
6SRC_URI = "git://sourceware.org/git/systemtap.git \ 6SRC_URI = "git://sourceware.org/git/systemtap.git \
7 file://docproc-build-fix.patch \ 7 file://docproc-build-fix.patch \
8 file://obsolete_automake_macros.patch \ 8 file://obsolete_automake_macros.patch \
9 file://system_map_location.patch \
9 file://tapset-linux-sendfile-syscall.patch \ 10 file://tapset-linux-sendfile-syscall.patch \
10 " 11 "
11 12