diff options
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/system_map_location.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
2 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch b/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch deleted file mode 100644 index 013af5c3a4..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/system_map_location.patch +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | systemtap: Cross compilation fix | ||
| 2 | |||
| 3 | This is a cross compilation fix. It allows systemtap to find | ||
| 4 | the kernel map file in the right place, i.e. in the kernel build tree. | ||
| 5 | Without this fix it takes a map file from the build host, if available. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com> | ||
| 10 | |||
| 11 | Index: 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 4d887ed4d2..eef0c9cbe1 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
| @@ -4,7 +4,6 @@ SRCREV = "4051c70c9318c837981384cbb23f3e9eb1bd0892" | |||
| 4 | PV = "3.2" | 4 | PV = "3.2" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ | 6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ |
| 7 | file://system_map_location.patch \ | ||
| 8 | file://configure-allow-to-disable-libvirt.patch \ | 7 | file://configure-allow-to-disable-libvirt.patch \ |
| 9 | file://x32_abi_time.patch \ | 8 | file://x32_abi_time.patch \ |
| 10 | file://monitor-option.patch \ | 9 | file://monitor-option.patch \ |
