From 787bed708676fc04aee2850825e803273152f657 Mon Sep 17 00:00:00 2001 From: Mikhail Durnev Date: Wed, 3 Sep 2014 13:01:50 +0500 Subject: 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 Signed-off-by: Muzaffar Mahmood Signed-off-by: Richard Purdie --- .../systemtap/systemtap/system_map_location.patch | 23 ++++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.inc | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-kernel/systemtap/systemtap/system_map_location.patch 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 + +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 \ " -- cgit 1.2.3-korg