6 files changed, 9 insertions, 20 deletions

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 7ad848c35e..3d2eb3929e 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -7,7 +7,7 @@ SECTION = "kernel"
 
 LICENSE = "GPL-2.0-only"
 
-inherit linux-kernel-base
+inherit kernelsrc
 
 # Whilst not a module, this ensures we don't get multilib extended (which would make no sense)
 inherit module-base
@@ -20,14 +20,10 @@ do_install[depends] += "virtual/kernel:do_shared_workdir"
 do_install[depends] += "virtual/kernel:do_install"
 
 # There's nothing to do here, except install the source where we can package it
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 deltask do_populate_sysroot
 
-S = "${STAGING_KERNEL_DIR}"
 B = "${STAGING_KERNEL_BUILDDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 157aca4d79..4f29bd5bbc 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -385,10 +385,6 @@ do_configure:prepend () {
     done
 }
 
-python do_package:prepend() {
-    d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
-}
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
diff --git a/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb b/meta/recipes-kernel/systemtap/systemtap-native_5.3.bb
index 8befa7a7ea..8befa7a7ea 100644
--- a/meta/recipes-kernel/systemtap/systemtap-native_5.2.bb
+++ b/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 15a6f2a9a5..7d35f76b29 100644
--- 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
index 588b3b8d36..588b3b8d36 100644
--- a/meta/recipes-kernel/systemtap/systemtap_5.2.bb
+++ b/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 30f3d25bc8..86336b0779 100644
--- 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'