summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Durnev <Mikhail_Durnev@mentor.com>2014-09-03 13:01:50 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-03 11:28:07 +0100
commit787bed708676fc04aee2850825e803273152f657 (patch)
treedc6066c32c69f3d1a86759459ac15e4dd4bb13b5
parent74bfb662246411aa062cd8b2acd37be1bbed39d3 (diff)
downloadopenembedded-core-contrib-787bed708676fc04aee2850825e803273152f657.tar.gz
openembedded-core-contrib-787bed708676fc04aee2850825e803273152f657.tar.bz2
openembedded-core-contrib-787bed708676fc04aee2850825e803273152f657.zip
systemtap: Cross compilation fix
This is a cross compilation fix. It allows systemtap to find the kernel map file in the right place, i.e. in the kernel build tree. Without this fix it takes a map file from the build host, if available. Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com> Signed-off-by: Muzaffar Mahmood <muzaffar_mahmood@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
+systemtap: Cross compilation fix
+
+This is a cross compilation fix. It allows systemtap to find
+the kernel map file in the right place, i.e. in the kernel build tree.
+Without this fix it takes a map file from the build host, if available.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
+
+Index: git/session.cxx
+===================================================================
+--- git.orig/session.cxx
++++ git/session.cxx
+@@ -1634,7 +1634,7 @@ systemtap_session::parse_kernel_function
+ clog << _F("Kernel symbol table %s unavailable, (%s)",
+ system_map_path.c_str(), strerror(errno)) << endl;
+
+- system_map_path = "/boot/System.map-" + kernel_release;
++ system_map_path = kernel_build_tree + "/System.map-" + kernel_release;
+ system_map.clear();
+ system_map.open(system_map_path.c_str(), ifstream::in);
+ 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}"
SRC_URI = "git://sourceware.org/git/systemtap.git \
file://docproc-build-fix.patch \
file://obsolete_automake_macros.patch \
+ file://system_map_location.patch \
file://tapset-linux-sendfile-syscall.patch \
"