2 files changed, 7 insertions, 19 deletions

diff --git a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch b/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
index c2d6d43402..988cda4f0c 100644
--- a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
@@ -1,11 +1,11 @@
 Upstream-Status: Pending
 
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff --git a/configure.ac b/configure.ac
-index 2a30ea1..713800d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,6 @@ AC_PROG_LN_S
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -19,7 +19,6 @@ AC_PROG_LN_S
  AC_PROG_CC
  AC_PROG_CXX
  AC_PROG_CPP
@@ -13,15 +13,3 @@ index 2a30ea1..713800d 100644
  AM_PROG_CC_C_O
  AC_PROG_RANLIB
  AC_OBJEXT
-diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac
-index 48f48db..68152db 100644
---- a/runtime/staprun/configure.ac
-+++ b/runtime/staprun/configure.ac
-@@ -13,7 +13,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
- AC_PROG_CC
- AC_PROG_CXX
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_SYS_LARGEFILE
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 6c67d34cb1..edaab9772e 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,8 +1,8 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "48fa6b5e1d3e636c34cbd5650370e6f634efc294"
-PV = "1.8+git${SRCPV}"
+SRCREV = "addec813fed4c712d6ea752f6e4f23e602b87fad"
+PV = "2.1+git${SRCPV}"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
            file://docproc-build-fix.patch \