systemtap: upgrade 5.2 -> 5.3

* fixed patch fuzz issue

[RP: Set tag in SRC_URI to match version]
Signed-off-by: Victor Kamensky <victor.kamensky7@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.3.bb
similarity index 100%
rename from meta/recipes-kernel/systemtap/systemtap-native_5.2.bb
rename to meta/recipes-kernel/systemtap/systemtap-native_5.3.bb

diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch
index 15a6f2a9a5c2b468a2b98641996bb1fc79a57bba..7d35f76b29aec88ca937653fa1ff1e323e64742b 100644 (file)
--- a/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-improve-reproducibility-for-c-compiling.patch
@@ -13,19 +13,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  stringtable.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/stringtable.h b/stringtable.h
-index 5fc42e7..6fd8a1e 100644
---- a/stringtable.h
-+++ b/stringtable.h
-@@ -19,7 +19,7 @@
+Index: git/stringtable.h
+===================================================================
+--- git.orig/stringtable.h
++++ git/stringtable.h
+@@ -23,7 +23,7 @@
  
- #if defined(HAVE_BOOST_UTILITY_STRING_REF_HPP)
+ #if 0 && defined(HAVE_BOOST_UTILITY_STRING_REF_HPP)
  #include <boost/version.hpp>
 -#include <boost/utility/string_ref.hpp> //header with string_ref
 +#include "@RELATIVE_STAGING_INCDIR@/boost/utility/string_ref.hpp" //header with string_ref
  
  // XXX: experimental tunables
  #define INTERNED_STRING_FIND_MEMMEM 1 /* perf stat indicates a very slight benefit */
--- 
-2.7.4
-

diff --git a/meta/recipes-kernel/systemtap/systemtap_5.2.bb b/meta/recipes-kernel/systemtap/systemtap_5.3.bb
similarity index 100%
rename from meta/recipes-kernel/systemtap/systemtap_5.2.bb
rename to meta/recipes-kernel/systemtap/systemtap_5.3.bb

diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 30f3d25bc8c95ae907c4d0ca0028d9c9ef982d83..86336b07798040085c285df7f2950d88f9ddc45b 100644 (file)
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +1,13 @@
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master \
+SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;tag=release-${PV} \
            file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
            file://0001-Install-python-modules-to-correct-library-dir.patch \
            file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \
            "
 
-SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de"
+SRCREV = "c4fc655170b534478a6b131292b987630c7c0865"
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
 COMPATIBLE_HOST:libc-musl = 'null'