[oe-commits] Saul Wold : systemtap: Upgrade to 2.6 Git Version

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 89a900cb356504bc56e507412adaf5a0d5043ac9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=89a900cb356504bc56e507412adaf5a0d5043ac9

Author: Saul Wold <sgw at linux.intel.com>
Date:   Thu Nov  6 16:19:33 2014 -0800

systemtap: Upgrade to 2.6 Git Version

Remove backported patch

Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../systemtap/tapset-linux-sendfile-syscall.patch  | 22 ----------------------
 meta/recipes-kernel/systemtap/systemtap_git.inc    |  5 ++---
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch b/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch
deleted file mode 100644
index f945760..0000000
--- a/meta/recipes-kernel/systemtap/systemtap/tapset-linux-sendfile-syscall.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-systemtap: Fixed probe syscall.sendfile failure
-
-compat_sendfile syscall is unavailable in kernels starting version 3.8.
-Hence systemtap scripts like 'probe syscall.* { if (target()==pid()) log(name." ".argstr) }' fail.
-This problem is solved by marking __syscall.compat_sendfile as optional in tapset/linux/syscalls2.stp
-
-Upstream-Status: Pending
-
-Signed-off-by: Mikhail Durnev <mikhail_durnev at mentor.com>
-
-diff -Naur old/tapset/linux/syscalls2.stp new/tapset/linux/syscalls2.stp
---- old/tapset/linux/syscalls2.stp	2014-04-21 01:28:41.000000000 -0500
-+++ new/tapset/linux/syscalls2.stp	2014-04-21 01:38:14.961233914 -0500
-@@ -1953,7 +1953,7 @@
- # COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd,
- #		compat_loff_t __user *, offset, compat_size_t, count)
- #
--probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile
-+probe syscall.sendfile = __syscall.sendfile, __syscall.compat_sendfile ?
- {
- 	name = "sendfile"
- 	out_fd = __int32($out_fd)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index f81e8ba..f9a19d9 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +1,12 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV = "8f0fcd995f7f650a2ee0a94539f90c99e6d19e1d"
-PV = "2.5+git${SRCPV}"
+SRCREV = "7682e51d2e11a35b2977ba9a85ab42f326b8ff8f"
+PV = "2.6+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 \
            file://configure-allow-to-disable-libvirt.patch \
           "