summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorVictor Kamensky <kamensky@cisco.com>2018-04-05 11:25:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-07 11:44:50 +0100
commitf08ef6e1b5c1b847693bc5bfdcfa9a3f6484e577 (patch)
tree42b653ddc15d816156ab739bfb1616c71d5b2745 /meta/recipes-kernel
parenta306bcc42726d57df38b5728fc469d4397c6ebd2 (diff)
downloadpoky-f08ef6e1b5c1b847693bc5bfdcfa9a3f6484e577.tar.gz
Revert "systemtap: Cross compilation fix"
This reverts commit 787bed708676fc04aee2850825e803273152f657. (From OE-Core rev: 08ab022471eff48e6f43ec8cd47e695d575ee2e3) Signed-off-by: Victor Kamensky <kamensky@cisco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-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, 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 @@
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 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"
4PV = "3.2" 4PV = "3.2"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git \ 6SRC_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 \