41 files changed, 995 insertions, 459 deletions

diff --git a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb
index 0e17800c4b..3bbfe4cf9f 100644
--- a/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb
+++ b/meta-oe/recipes-kernel/agent-proxy/agent-proxy_1.97.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git;protoc
 
 BBCLASSEXTEND = "native nativesdk"
 
-S = "${WORKDIR}/git"
 
 do_install () {
     install -d ${D}${bindir}
diff --git a/meta-oe/recipes-kernel/blktests/blktests.bb b/meta-oe/recipes-kernel/blktests/blktests.bb
new file mode 100644
index 0000000000..ded03a4de2
--- /dev/null
+++ b/meta-oe/recipes-kernel/blktests/blktests.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Linux kernel block layer testing framework"
+DESCRIPTION = "blktests is a test framework for the Linux kernel block layer and storage stack. It is inspired by the xfstests filesystem testing framework."
+DEPENDS = "gnutls keyutils glib-2.0 libnl"
+RDEPENDS:${PN} += " bash coreutils gawk util-linux fio"
+LICENSE = "GPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES/GPL-3.0;md5=d32239bcb673463ab874e80d47fae504"
+
+SRCREV = "9aa2023312bfcdd6b31c24b6e4a4a5c2d4f870d2"
+SRC_URI = " \
+        git://github.com/osandov/blktests.git;nobranch=1;protocol=https \
+        "
+
+
+inherit autotools-brokensep
+
+do_configure[noexec] = "1"
+
+FILES:${PN} = "/usr/blktests/*"
diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-oe/recipes-kernel/bpftool/bpftool.bb
index b22334fe90..d19746184c 100644
--- a/meta-oe/recipes-kernel/bpftool/bpftool.bb
+++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb
@@ -14,7 +14,7 @@ EXTRA_OEMAKE = "\
     -C ${S}/tools/bpf/bpftool \
     O=${B} \
     CROSS=${TARGET_PREFIX} \
-    CC="${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH}" \
+    CC="${CC} ${DEBUG_PREFIX_MAP} -ffile-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} ${CFLAGS}" \
     HOSTCC="${BUILD_CC} ${BUILD_CFLAGS}" \
     LD="${LD}" \
     AR=${AR} \
@@ -26,7 +26,7 @@ SECURITY_CFLAGS = ""
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
-COMPATIBLE_HOST = "(x86_64|aarch64).*-linux"
+COMPATIBLE_HOST = "(x86_64|aarch64|riscv64).*-linux"
 COMPATIBLE_HOST:libc-musl = 'null'
 
 do_compile() {
diff --git a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb
index 4b6026ebc0..fe980e3e6f 100644
--- a/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb
+++ b/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb
@@ -14,7 +14,6 @@ SRCREV = "a0eb4805dbb232f02f156b9351a23790c1a4cec7"
 
 PE = "1"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb
index 18e3638052..453ebe8c7f 100644
--- a/meta-oe/recipes-kernel/cpupower/cpupower.bb
+++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/cpupower"
 
 inherit kernelsrc kernel-arch bash-completion
 
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 
 EXTRA_OEMAKE = "-C ${S}/tools/power/cpupower O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}"
 
diff --git a/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb b/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.6.bb
index 54883cef38..bafe56d2c4 100644
--- a/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb
+++ b/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.6.bb
@@ -15,9 +15,9 @@ DEPENDS = "\
     nativesdk-mpfr \
     nativesdk-readline \
     nativesdk-zlib \
-    virtual/${HOST_PREFIX}gcc \
-    virtual/${HOST_PREFIX}binutils \
-    virtual/nativesdk-${HOST_PREFIX}compilerlibs \
+    virtual/nativesdk-cross-cc \
+    virtual/nativesdk-cross-binutils \
+    virtual/nativesdk-compilerlibs \
     virtual/nativesdk-libc"
 
 RDEPENDS:${PN} = "nativesdk-liblzma"
diff --git a/meta-oe/recipes-kernel/crash/crash.inc b/meta-oe/recipes-kernel/crash/crash.inc
index 04318b1505..3c9a99ae4a 100644
--- a/meta-oe/recipes-kernel/crash/crash.inc
+++ b/meta-oe/recipes-kernel/crash/crash.inc
@@ -14,16 +14,21 @@ DEPENDS = "zlib readline coreutils-native ncurses-native"
 
 INC_PR = "r1"
 
-S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=https \
-           ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=git \
+           ${GNU_MIRROR}/gdb/gdb-10.2.tar.gz;name=gdb;subdir=${BB_GIT_DEFAULT_DESTSUFFIX} \
            file://7001force_define_architecture.patch \
            file://7003cross_ranlib.patch \
            file://0001-cross_add_configure_option.patch \
            file://donnot-extract-gdb-during-do-compile.patch \
            file://gdb_build_jobs_and_not_write_crash_target.patch \
+           file://0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch \
+           file://0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch \
+           file://0003-Fix-build-failure-in-readline-lib.patch \
+           file://0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch \
+           file://0005-Fix-build-failure-on-32bit-machine-i686.patch \
+           file://0001-Use-CC-env-var-to-get-compiler-version.patch \
            "
-SRCREV = "a6832f608cb5d473739cf33bbf84ab1df8d98fd5"
+SRCREV = "f13853cef53f5c5463a51021edbc81977e2b1405"
 
 SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350"
 
diff --git a/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch b/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch
new file mode 100644
index 0000000000..773598def1
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0001-Use-CC-env-var-to-get-compiler-version.patch
@@ -0,0 +1,48 @@
+From 6ad5e9302057e157ab701880a8543ca59058df2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
+Date: Fri, 16 May 2025 16:18:28 +0200
+Subject: [PATCH v2] Use CC env var to get compiler version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The source file build_data.c generated at compilation time define a
+variable compiler_version which is obtained by calling "gcc --version"
+cmd. This call retrieve the native gcc compiler install on host build
+machine but not necessarily the compiler use to build the project (ex:
+cross compilation).
+
+The CC env variable commonly used in Makefile project define the
+compiler to use at build, so this is the appropriate way to retrieve the
+compiler version, when the CC env var is define.
+
+Upstream-Status: Submitted [https://lists.crash-utility.osci.io/archives/list/devel@lists.crash-utility.osci.io/thread/V3G3QH3YW6WZWD56TVTFQIHYLZ33UIJL/]
+
+Signed-off-by: Kéléfa Sané <kelefa.sane@smile.fr>
+---
+ configure.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/configure.c b/configure.c
+index 4668c9a..4b65bd7 100644
+--- a/configure.c
++++ b/configure.c
+@@ -1362,7 +1362,17 @@ make_build_data(char *target)
+ 
+         fp1 = popen("date", "r");
+         fp2 = popen("id", "r");
+-       fp3 = popen("gcc --version", "r");
++
++       const char *cc_env = getenv("CC");
++       if(NULL == cc_env) {
++               fp3 = popen("gcc --version", "r");
++       }
++       else {
++               char compiler_version_cmd[512];
++
++               snprintf(compiler_version_cmd, sizeof(compiler_version_cmd), "%s --version", cc_env);
++               fp3 = popen(compiler_version_cmd, "r");
++       }
+ 
+        if ((fp4 = fopen("build_data.c", "w")) == NULL) {
+                perror("build_data.c");
diff --git a/meta-oe/recipes-kernel/crash/crash/0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch b/meta-oe/recipes-kernel/crash/crash/0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch
new file mode 100644
index 0000000000..47182f8b6c
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0001-symbol-fix-S-cannot-work-with-kaslr-detection.patch
@@ -0,0 +1,89 @@
+From 329bd56da28fc1b5b53a60ca2172643d2090435d Mon Sep 17 00:00:00 2001
+From: Tao Liu <ltao@redhat.com>
+Date: Fri, 13 Dec 2024 08:36:03 +0000
+Subject: [PATCH] symbol: fix -S cannot work with kaslr detection
+
+When kernel enabled the CONFIG_RANDOMIZE_BASE, crash needs to add "kaslr=auto"
+in crash command line to tell crash to decode the random address.
+But when with "-S" in command line, crash would bypass the kaslr option
+that cause symbol from kernel image is mismatch with ram on a live system.
+
+The fix is provided by Tao Liu <ltao@redhat.com> from crash-utility upstream,
+and not merged to crash master yet.
+
+Upstream-Status: Pending
+[https://lists.crash-utility.osci.io/archives/list/devel@lists.crash-utility.osci.io/thread/5OXNYPPU6GLLQKCWH7WBNBJXLNZ4EBZD/]
+
+Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
+---
+ symbols.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/symbols.c b/symbols.c
+index a3cd0f3..6062d21 100644
+--- a/symbols.c
++++ b/symbols.c
+@@ -25,7 +25,7 @@
+ 
+ static void store_symbols(bfd *, int, void *, long, unsigned int);
+ static void store_sysmap_symbols(void);
+-static ulong relocate(ulong, char *, int);
++static ulong relocate(ulong, char *, int *);
+ static int relocate_force(ulong, char *);
+ static void kaslr_init(void);
+ static void strip_module_symbol_end(char *s);
+@@ -230,6 +230,7 @@ symtab_init(void)
+                                DEBUGINFO_ERROR_MESSAGE1 :
+                                DEBUGINFO_ERROR_MESSAGE2);
+                }
++               kt->flags |= RELOC_FORCE;
+                store_sysmap_symbols();
+                return;
+        } else if (LKCD_KERNTYPES())
+@@ -817,7 +818,7 @@ store_symbols(bfd *abfd, int dynamic, void *minisyms, long symcount,
+                    syminfo.type)) {
+                        if (kt->flags & (RELOC_SET|RELOC_FORCE))
+                                sp->value = relocate(syminfo.value,
+-                                       (char *)syminfo.name, !(first++));
++                                       (char *)syminfo.name, &first);
+                        else
+                                sp->value = syminfo.value;
+                        sp->type = syminfo.type;
+@@ -893,9 +894,9 @@ store_sysmap_symbols(void)
+ 
+                 if (machdep->verify_symbol(name, syment.value, 
+                    syment.type)) {
+-                       if (kt->flags & RELOC_SET)
++                       if (kt->flags & (RELOC_SET|RELOC_FORCE))
+                                sp->value = relocate(syment.value,
+-                                       syment.name, !(first++));
++                                       syment.name, &first);
+                        else
+                                sp->value = syment.value;
+                         sp->type = syment.type;
+@@ -924,7 +925,7 @@ store_sysmap_symbols(void)
+  *  are not as loaded into the kernel (not unity-mapped).
+  */
+ static ulong
+-relocate(ulong symval, char *symname, int first_symbol)
++relocate(ulong symval, char *symname, int *first_symbol)
+ {
+        if (XEN_HYPER_MODE()) {
+                kt->flags &= ~(RELOC_SET|RELOC_FORCE);
+@@ -937,9 +938,10 @@ relocate(ulong symval, char *symname, int first_symbol)
+                break;
+ 
+        case RELOC_FORCE:
+-               if (first_symbol && !relocate_force(symval, symname))
+-                       kt->flags &= ~RELOC_FORCE;
+-               break;
++               if (!(*first_symbol) && relocate_force(symval, symname)) {
++                       *first_symbol += 1;
++               }
++               return symval - kt->relocate;
+        }
+ 
+        if (machine_type("X86_64")) {
+-- 
+2.35.5
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch b/meta-oe/recipes-kernel/crash/crash/0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch
new file mode 100644
index 0000000000..42a585d366
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0002-arm64-add-pac-mask-to-better-support-gdb-stack-unwin.patch
@@ -0,0 +1,85 @@
+From 0f39e33d3504f3a17b83574c3be97640460b7eef Mon Sep 17 00:00:00 2001
+From: "Guanyou.Chen" <chenguanyou@xiaomi.com>
+Date: Wed, 25 Dec 2024 23:50:28 +0800
+Subject: [PATCH] arm64: add pac mask to better support gdb stack unwind
+
+Currently, gdb passthroughs of 'bt', 'frame', 'up', 'down',
+'info, locals' don't work on arm64 machine enabled pauth.
+This is because gdb does not know the lr register actual values
+to unwind the stack frames.
+
+Without the patch:
+    crash> gdb bt
+    #0  __switch_to (prev=0xffffff8001af92c0, next=0xffffff889da7a580) at /proc/self/cwd/common/arch/arm64/kernel/process.c:569
+    #1  0x9fc5c5d3602132c0 in ?? ()
+    Backtrace stopped: previous frame identical to this frame (corrupt stack?)
+
+With the patch:
+    crash> gdb bt
+    #0  __switch_to (prev=prev@entry=0xffffff8001af92c0, next=next@entry=0xffffff889da7a580) at /proc/self/cwd/common/arch/arm64/kernel/process.c:569
+    #1  0xffffffd3602132c0 in context_switch (rq=0xffffff8a7295a080, prev=0xffffff8001af92c0, next=0xffffff889da7a580, rf=<optimized out>) at /proc/self/cwd/common/kernel/sched/core.c:5515
+    #2  __schedule (sched_mode=<optimized out>, sched_mode@entry=2147859424) at /proc/self/cwd/common/kernel/sched/core.c:6843
+    #3  0xffffffd3602136d8 in schedule () at /proc/self/cwd/common/kernel/sched/core.c:6917
+    ...
+
+Signed-off-by: Guanyou.Chen <chenguanyou@xiaomi.com>
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Backport [0f39e33 arm64: add pac mask to better support gdb stack unwind]
+---
+ gdb-10.2.patch  | 23 +++++++++++++++++++++++
+ gdb_interface.c | 10 ++++++++++
+ 2 files changed, 33 insertions(+)
+
+diff --git a/gdb-10.2.patch b/gdb-10.2.patch
+index c867660..fd6fadb 100644
+--- a/gdb-10.2.patch
++++ b/gdb-10.2.patch
+@@ -16216,3 +16216,26 @@ exit 0
+            printf_filtered (_("Backtrace stopped: %s\n"),
+                             frame_stop_reason_string (trailing));
+        }
++--- gdb-10.2/gdb/frame.c.orig
+++++ gdb-10.2/gdb/frame.c
++@@ -944,6 +944,10 @@ frame_find_by_id (struct frame_id id)
++   return NULL;
++ }
++
+++#ifdef CRASH_MERGE
+++extern "C" void crash_decode_ptrauth_pc(ulong* pc);
+++#endif
+++
++ static CORE_ADDR
++ frame_unwind_pc (struct frame_info *this_frame)
++ {
++@@ -974,6 +978,9 @@ frame_unwind_pc (struct frame_info *this_frame)
++       try
++       {
++         pc = gdbarch_unwind_pc (prev_gdbarch, this_frame);
+++#ifdef CRASH_MERGE
+++        crash_decode_ptrauth_pc(&pc);
+++#endif
++         pc_p = true;
++       }
++       catch (const gdb_exception_error &ex)
+diff --git a/gdb_interface.c b/gdb_interface.c
+index 315711e..e108d09 100644
+--- a/gdb_interface.c
++++ b/gdb_interface.c
+@@ -1083,3 +1083,13 @@ int crash_get_current_task_reg (int regno, const char *regname,
+        return machdep->get_current_task_reg(regno, regname, regsize, value);
+ }
+ 
++/* arm64 kernel lr maybe has patuh */
++void crash_decode_ptrauth_pc(ulong *pc);
++void crash_decode_ptrauth_pc(ulong *pc)
++{
++#ifdef ARM64
++       struct machine_specific *ms = machdep->machspec;
++       if (is_kernel_text(*pc | ms->CONFIG_ARM64_KERNELPACMASK))
++               *pc |= ms->CONFIG_ARM64_KERNELPACMASK;
++#endif /* !ARM64 */
++}
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0003-Fix-build-failure-in-readline-lib.patch b/meta-oe/recipes-kernel/crash/crash/0003-Fix-build-failure-in-readline-lib.patch
new file mode 100644
index 0000000000..f3318b3a6a
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0003-Fix-build-failure-in-readline-lib.patch
@@ -0,0 +1,136 @@
+From 772fbb1022911410b5fb773fde37910fc8286041 Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Fri, 24 Jan 2025 16:12:40 +0800
+Subject: [PATCH] Fix build failure in readline lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a backported patch from gdb upstream, see the commit
+425f843d58c5 ("Import GNU Readline 8.2"), and only backported
+patch related to compilation errors.
+
+Without the patch:
+
+  signals.c: In function ‘_rl_handle_signal’:
+  signals.c:62:36: error: ‘return’ with a value, in function returning void [-Wreturn-mismatch]
+     62 | #  define SIGHANDLER_RETURN return (0)
+        |                                    ^
+  signals.c:290:3: note: in expansion of macro ‘SIGHANDLER_RETURN’
+    290 |   SIGHANDLER_RETURN;
+        |   ^~~~~~~~~~~~~~~~~
+  signals.c:178:1: note: declared here
+    178 | _rl_handle_signal (int sig)
+        | ^~~~~~~~~~~~~~~~~
+  signals.c: In function ‘rl_sigwinch_handler’:
+  signals.c:306:32: error: passing argument 2 of ‘rl_set_sighandler’ from incompatible pointer type [-Wincompatible-pointer-types]
+    306 |   rl_set_sighandler (SIGWINCH, rl_sigwinch_handler, &dummy_winch);
+        |                                ^~~~~~~~~~~~~~~~~~~
+        |                                |
+        |                                void (*)(int)
+  In file included from rldefs.h:31,
+                   from signals.c:37:
+  signals.c:81:51: note: expected ‘void (*)(void)’ but argument is of type ‘void (*)(int)’
+     81 | static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
+
+Note: the current build failure was observed on gcc (GCC) 15.0.0.
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Backport [772fbb1 Fix build failure in readline lib]
+---
+ gdb-10.2.patch | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 82 insertions(+)
+
+diff --git a/gdb-10.2.patch b/gdb-10.2.patch
+index fd6fadb..8f5d7db 100644
+--- a/gdb-10.2.patch
++++ b/gdb-10.2.patch
+@@ -16239,3 +16239,85 @@ exit 0
+          pc_p = true;
+        }
+        catch (const gdb_exception_error &ex)
++--- gdb-10.2/readline/readline/signals.c.orig
+++++ gdb-10.2/readline/readline/signals.c
++@@ -48,23 +48,11 @@
++ 
++ #if defined (HANDLE_SIGNALS)
++ 
++-#if !defined (RETSIGTYPE)
++-#  if defined (VOID_SIGHANDLER)
++-#    define RETSIGTYPE void
++-#  else
++-#    define RETSIGTYPE int
++-#  endif /* !VOID_SIGHANDLER */
++-#endif /* !RETSIGTYPE */
++-
++-#if defined (VOID_SIGHANDLER)
++-#  define SIGHANDLER_RETURN return
++-#else
++-#  define SIGHANDLER_RETURN return (0)
++-#endif
+++#define SIGHANDLER_RETURN return
++ 
++ /* This typedef is equivalent to the one for Function; it allows us
++    to say SigHandler *foo = signal (SIGKILL, SIG_IGN); */
++-typedef RETSIGTYPE SigHandler ();
+++typedef void SigHandler (int);
++ 
++ #if defined (HAVE_POSIX_SIGNALS)
++ typedef struct sigaction sighandler_cxt;
++@@ -78,12 +66,12 @@ typedef struct { SigHandler *sa_handler; int sa_mask, sa_flags; } sighandler_cxt
++ #  define SA_RESTART 0
++ #endif
++ 
++-static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
++-static void rl_maybe_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *));
++-static void rl_maybe_restore_sighandler PARAMS((int, sighandler_cxt *));
+++static SigHandler *rl_set_sighandler (int, SigHandler *, sighandler_cxt *);
+++static void rl_maybe_set_sighandler (int, SigHandler *, sighandler_cxt *);
+++static void rl_maybe_restore_sighandler (int, sighandler_cxt *);
++ 
++-static RETSIGTYPE rl_signal_handler PARAMS((int));
++-static RETSIGTYPE _rl_handle_signal PARAMS((int));
+++static void rl_signal_handler (int);
+++static void _rl_handle_signal (int);
++      
++ /* Exported variables for use by applications. */
++ 
++@@ -137,7 +125,7 @@ void *_rl_sigcleanarg;
++ /* Readline signal handler functions. */
++ 
++ /* Called from RL_CHECK_SIGNALS() macro */
++-RETSIGTYPE
+++void
++ _rl_signal_handler (int sig)
++ {
++   _rl_caught_signal = 0;      /* XXX */
++@@ -160,7 +148,7 @@ _rl_signal_handler (int sig)
++   SIGHANDLER_RETURN;
++ }
++ 
++-static RETSIGTYPE
+++static void
++ rl_signal_handler (int sig)
++ {
++   if (_rl_interrupt_immediately)
++@@ -174,7 +162,7 @@ rl_signal_handler (int sig)
++   SIGHANDLER_RETURN;
++ }
++ 
++-static RETSIGTYPE
+++static void
++ _rl_handle_signal (int sig)
++ {
++ #if defined (HAVE_POSIX_SIGNALS)
++@@ -291,7 +279,7 @@ _rl_handle_signal (int sig)
++ }
++ 
++ #if defined (SIGWINCH)
++-static RETSIGTYPE
+++static void
++ rl_sigwinch_handler (int sig)
++ {
++   SigHandler *oh;
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch b/meta-oe/recipes-kernel/crash/crash/0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch
new file mode 100644
index 0000000000..e4bd4cd3a9
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0004-tools.c-do-not-use-keywords-nullptr-as-a-variable-in.patch
@@ -0,0 +1,60 @@
+From 325a9d1b3b4ce76bf4556235c885e619e219622c Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Fri, 24 Jan 2025 15:32:59 +0800
+Subject: [PATCH] tools.c: do not use keywords 'nullptr' as a variable in code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without the patch:
+
+  tools.c: In function ‘drop_core’:
+  tools.c:6251:23: error: expected identifier or ‘(’ before ‘nullptr’
+   6251 |         volatile int *nullptr;
+        |                       ^~~~~~~
+  tools.c:6259:17: error: lvalue required as left operand of assignment
+   6259 |         nullptr = NULL;
+        |                 ^
+  tools.c:6261:21: error: invalid type argument of unary ‘*’ (have ‘typeof (nullptr)’)
+   6261 |                 i = *nullptr;
+        |                     ^~~~~~~~
+  make[6]: *** [Makefile:345: tools.o] Error 1
+
+Note: this was observed on gcc version 15.0.1
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+Signed-off-by: mark.yang <mark.yang@lge.com>
+
+Upstream-Status: Backport [325a9d1 tools.c: do not use keywords 'nullptr' as a variable in code]
+---
+ tools.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools.c b/tools.c
+index 85d8b6f..c9305be 100644
+--- a/tools.c
++++ b/tools.c
+@@ -6248,7 +6248,7 @@ lowest_bit_long(ulong val)
+ void
+ drop_core(char *s)
+ {
+-       volatile int *nullptr;
++       volatile int *ptr;
+        int i ATTRIBUTE_UNUSED;
+ 
+        if (s && ascii_string(s))
+@@ -6256,9 +6256,9 @@ drop_core(char *s)
+ 
+        kill((pid_t)pc->program_pid, 3);
+ 
+-       nullptr = NULL;
++       ptr = NULL;
+        while (TRUE)
+-               i = *nullptr;
++               i = *ptr;
+ }
+ 
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash/0005-Fix-build-failure-on-32bit-machine-i686.patch b/meta-oe/recipes-kernel/crash/crash/0005-Fix-build-failure-on-32bit-machine-i686.patch
new file mode 100644
index 0000000000..e4796b9ced
--- /dev/null
+++ b/meta-oe/recipes-kernel/crash/crash/0005-Fix-build-failure-on-32bit-machine-i686.patch
@@ -0,0 +1,83 @@
+From 2724bb1d0260f3886f8a3d533838caf80c7e61e5 Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Fri, 24 Jan 2025 17:56:23 +0800
+Subject: [PATCH 10/10] Fix build failure on 32bit machine(i686)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This issue was caused by commit 0f39e33d3504 with the following
+compilation error:
+
+  frame.c: In function ‘CORE_ADDR frame_unwind_pc(frame_info*)’:
+  frame.c:982:35: error: cannot convert ‘CORE_ADDR*’ {aka ‘long long unsigned int*’} to ‘ulong*’ {aka ‘long unsigned int*’}
+    982 |           crash_decode_ptrauth_pc(&pc);
+        |                                   ^~~
+        |                                   |
+        |                                   CORE_ADDR* {aka long long unsigned int*}
+  frame.c:948:48: note: initializing argument 1 of ‘void crash_decode_ptrauth_pc(ulong*)’
+    948 | extern "C" void crash_decode_ptrauth_pc(ulong* pc);
+        |                                         ~~~~~~~^~
+
+Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/2724bb1d0260f3886f8a3d533838caf80c7e61e5]
+Fixes: 0f39e33d3504 ("arm64: add pac mask to better support gdb stack unwind")
+Reported-by: Guanyou.Chen <chenguanyou@xiaomi.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ gdb-10.2.patch  | 6 +++---
+ gdb_interface.c | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gdb-10.2.patch b/gdb-10.2.patch
+index 8f5d7db22840..d22f2d6d75bc 100644
+--- a/gdb-10.2.patch
++++ b/gdb-10.2.patch
+@@ -55,7 +55,7 @@ exit 0
+  # your system doesn't have fcntl.h in /usr/include (which is where it
+  # should be according to Posix).
+ -DEFS = @DEFS@
+-+DEFS = -DCRASH_MERGE @DEFS@
+++DEFS = -DCRASH_MERGE -D${CRASH_TARGET} @DEFS@
+  GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \
+        -DLOCALEDIR="\"$(localedir)\"" $(DEFS)
+  
+@@ -16222,7 +16222,7 @@ exit 0
+    return NULL;
+  }
+ 
+-+#ifdef CRASH_MERGE
+++#if defined(CRASH_MERGE) && defined(ARM64)
+ +extern "C" void crash_decode_ptrauth_pc(ulong* pc);
+ +#endif
+ +
+@@ -16233,7 +16233,7 @@ exit 0
+        try
+        {
+          pc = gdbarch_unwind_pc (prev_gdbarch, this_frame);
+-+#ifdef CRASH_MERGE
+++#if defined(CRASH_MERGE) && defined(ARM64)
+ +        crash_decode_ptrauth_pc(&pc);
+ +#endif
+          pc_p = true;
+diff --git a/gdb_interface.c b/gdb_interface.c
+index e108d097ee5f..c2e99f5c156a 100644
+--- a/gdb_interface.c
++++ b/gdb_interface.c
+@@ -1084,12 +1084,12 @@ int crash_get_current_task_reg (int regno, const char *regname,
+ }
+ 
+ /* arm64 kernel lr maybe has patuh */
++#ifdef ARM64
+ void crash_decode_ptrauth_pc(ulong *pc);
+ void crash_decode_ptrauth_pc(ulong *pc)
+ {
+-#ifdef ARM64
+        struct machine_specific *ms = machdep->machspec;
+        if (is_kernel_text(*pc | ms->CONFIG_ARM64_KERNELPACMASK))
+                *pc |= ms->CONFIG_ARM64_KERNELPACMASK;
+-#endif /* !ARM64 */
+ }
++#endif /* !ARM64 */
+-- 
+2.47.1
+
diff --git a/meta-oe/recipes-kernel/crash/crash_8.0.4.bb b/meta-oe/recipes-kernel/crash/crash_8.0.6.bb
index 1af90978e0..1af90978e0 100644
--- a/meta-oe/recipes-kernel/crash/crash_8.0.4.bb
+++ b/meta-oe/recipes-kernel/crash/crash_8.0.6.bb
diff --git a/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.32.bb b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.32.bb
new file mode 100644
index 0000000000..31674ffec0
--- /dev/null
+++ b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.32.bb
@@ -0,0 +1,79 @@
+SUMMARY = "drgn (pronounced dragon) is a debugger with an emphasis on  \
+programmability. drgn exposes the types and variables in a program for easy, \
+expressive scripting in Python."
+HOMEPAGE = "https://github.com/osandov/drgn"
+LICENSE = " LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7c83d30e99508d6b790eacdd3abab846"
+
+SRC_URI = "git://github.com/osandov/drgn.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "348d6efc5c18e0ae4ef2f3aea50a8edf17cb1fe9"
+
+
+DEPENDS = "\
+    autoconf-native \
+    automake-native \
+    libtool-native \
+    elfutils \
+    "
+
+DEPENDS:append:toolchain-clang:class-target = "\
+    openmp \
+    "
+
+OPENMP_LIB = "libgomp"
+OPENMP_LIB:toolchain-clang:class-target = "openmp"
+
+RDEPENDS:${PN} = "\
+    python3-crypt \
+    python3-io \
+    python3-logging \
+    python3-math \
+    python3-pickle \
+    python3-stringold \
+    python3-compression \
+    "
+
+RDEPENDS:${PN}:append:class-target = "\
+    libdw \
+    libelf \
+    ${OPENMP_LIB} \
+    "
+
+RDEPENDS:${PN}:append:class-native = "\
+    elfutils-native \
+    "
+
+RDEPENDS:${PN}:append:class-nativesdk = "\
+    nativesdk-elfutils \
+    "
+
+OPENMP_LIB_NAME = "gomp"
+OPENMP_LIB_NAME:toolchain-clang:class-target = "omp"
+
+export CONFIGURE_FLAGS = "\
+    --build=${BUILD_SYS}, \
+    --host=${HOST_SYS}, \
+    --target=${TARGET_SYS}, \
+    --prefix=${prefix}, \
+    --exec_prefix=${exec_prefix}, \
+    --bindir=${bindir}, \
+    --sbindir=${sbindir}, \
+    --libexecdir=${libexecdir}, \
+    --datadir=${datadir}, \
+    --sysconfdir=${sysconfdir}, \
+    --sharedstatedir=${sharedstatedir}, \
+    --localstatedir=${localstatedir}, \
+    --libdir=${libdir}, \
+    --includedir=${includedir}, \
+    --oldincludedir=${includedir}, \
+    --infodir=${infodir}, \
+    --mandir=${mandir}, \
+    --enable-openmp=${OPENMP_LIB_NAME} \
+    "
+
+export PYTHON_CPPFLAGS = "-I${STAGING_INCDIR}/${PYTHON_DIR}"
+
+inherit python3native pkgconfig setuptools3
+
+BBCLASSEXTEND = "native nativesdk"
+
diff --git a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
index 23ea0d8aae..3b5866180d 100644
--- a/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
+++ b/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb
@@ -13,7 +13,7 @@ COMPATIBLE_HOST:libc-musl = 'null'
 
 DEPENDS = "libnl"
 
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 
 B = "${WORKDIR}/${BPN}-${PV}"
 
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
index 7a15d16bc3..b5b8075fd7 100644
--- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
+++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb
@@ -21,18 +21,20 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9aa91e13d644326bf281924212862184"
 
 DEPENDS = "openssl readline ncurses"
-SRCREV = "ab5ce5baff097ebb6e2a17a171858be213ee68d3"
+SRCREV = "bf774149ae7f74c12164a5b021b23520c5ca4016"
 SRC_URI = "git://codeberg.org/ipmitool/ipmitool;protocol=https;branch=master \
            ${IANA_ENTERPRISE_NUMBERS} \
            file://0001-csv-revision-Drop-the-git-revision-info.patch \
            "
+
+UPSTREAM_CHECK_GITTAGREGEX = "IPMITOOL_(?P<pver>\d+(_\d+)+)"
+
 IANA_ENTERPRISE_NUMBERS ?= ""
 
 # Add these via bbappend if this database is needed by the system
 #IANA_ENTERPRISE_NUMBERS = "http://www.iana.org/assignments/enterprise-numbers.txt;name=iana-enterprise-numbers;downloadfilename=iana-enterprise-numbers"
 #SRC_URI[iana-enterprise-numbers.sha256sum] = "cdd97fc08325667434b805eb589104ae63f7a9eb720ecea73cb55110b383934c"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
@@ -57,3 +59,6 @@ EXTRA_OECONF = "--disable-dependency-tracking --enable-file-security --disable-i
                 --disable-registry-download \
                 "
 
+# http://errors.yoctoproject.org/Errors/Details/766896/
+# git/lib/ipmi_fru.c:1556:41: error: initialization of 'struct fru_multirec_mgmt *' from incompatible pointer type 'struct fru_multirect_mgmt *' [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
index 3f57ef3bfd..14aa5d0c0c 100644
--- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb
@@ -2,16 +2,19 @@ SUMMARY = "Kernel selftest for Linux"
 DESCRIPTION = "Kernel selftest for Linux"
 LICENSE = "GPL-2.0-only"
 
-LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS = "rsync-native llvm-native"
 
+S = "${UNPACKDIR}"
+
 # for musl libc
 SRC_URI:append:libc-musl = "\
                       file://userfaultfd.patch \
                       "
 SRC_URI += "file://run-ptest \
             file://COPYING \
+            file://0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch \
             "
 
 # now we just test bpf and vm
@@ -42,8 +45,6 @@ do_compile[depends] += "virtual/kernel:do_install"
 
 inherit linux-kernel-base module-base kernel-arch ptest siteinfo
 
-S = "${WORKDIR}/${BP}"
-
 DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"
 
 TEST_LIST = "\
@@ -55,7 +56,7 @@ TEST_LIST = "\
 EXTRA_OEMAKE = '\
     CROSS_COMPILE=${TARGET_PREFIX} \
     ARCH=${ARCH} \
-    CC="${CC}" \
+    CC="${CC} ${DEBUG_PREFIX_MAP}" \
     AR="${AR}" \
     LD="${LD}" \
     CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS} -isystem ${S} -D__WORDSIZE=\'64\' -Wno-error=unused-command-line-argument" \
@@ -96,33 +97,17 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t
     sed -i -e '/mrecord-mcount/d' ${S}/Makefile
     sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile
     sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.*
-    for i in ${TEST_LIST}
-    do
-        oe_runmake -C ${S}/tools/testing/selftests/${i}
-    done
+    oe_runmake -C ${S}/tools/testing/selftests TARGETS="${TEST_LIST}"
 }
 
 do_install() {
-    for i in ${TEST_LIST}
-    do
-        oe_runmake -C ${S}/tools/testing/selftests/${i} INSTALL_PATH=${D}/usr/kernel-selftest/${i} install
-        # Install kselftest-list.txt that required by kselftest runner.
-        oe_runmake -s --no-print-directory COLLECTION=${i} -C ${S}/tools/testing/selftests/${i} emit_tests \
-            >> ${D}/usr/kernel-selftest/kselftest-list.txt
-    done
-    # Install kselftest runner.
-    install -m 0755 ${S}/tools/testing/selftests/run_kselftest.sh ${D}/usr/kernel-selftest/
-    cp -R --no-dereference --preserve=mode,links -v ${S}/tools/testing/selftests/kselftest ${D}/usr/kernel-selftest/
+    oe_runmake -C ${S}/tools/testing/selftests INSTALL_PATH=${D}/usr/kernel-selftest TARGETS="${TEST_LIST}" install
     if [ -e ${D}/usr/kernel-selftest/bpf/test_offload.py ]; then
-        sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py
+        sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py
     fi
     chown root:root  -R ${D}/usr/kernel-selftest
 }
 
-do_configure() {
-    install -D -m 0644 ${UNPACKDIR}/COPYING ${S}/COPYING
-}
-
 do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated"
 python copy_kselftest_source_from_kernel() {
     sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split()
@@ -149,15 +134,23 @@ remove_unrelated() {
     fi
 }
 
+do_configure[dirs] = "${S}"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-INHIBIT_PACKAGE_DEBUG_SPLIT="1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 FILES:${PN} += "/usr/kernel-selftest"
 
 RDEPENDS:${PN} += "python3 perl perl-module-io-handle"
 
 INSANE_SKIP:${PN} += "libdir"
 
+# A few of the selftests set compile flags that trip up the "ldflags" and
+# "already-stripped" QA checks.  As this is mainly a testing package and
+# not really meant for user level execution, disable these two checks.
+INSANE_SKIP:${PN} += "ldflags"
+INSANE_SKIP:${PN} += "already-stripped"
+
 SECURITY_CFLAGS = ""
 COMPATIBLE_HOST:libc-musl = 'null'
 
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch
new file mode 100644
index 0000000000..bf5525c361
--- /dev/null
+++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch
@@ -0,0 +1,34 @@
+From 34021e84d03e2becb88e6c28e8e4867e82a81da5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 17 Sep 2024 17:40:03 -0700
+Subject: [PATCH] selftests: timers: Fix clock_adjtime for newer 32-bit arches
+
+Newer 32-bit architectures e.g. riscv32 are using 64-bit time_t
+from get go, they have not wired __NR_clock_adjtime at all
+valid-adjtimex testcase fails to compile on such architectures.
+if this condition is found then use 64-bit adjtime syscall
+
+Upstream-Status: Submitted [https://patchwork.kernel.org/project/linux-kselftest/patch/20240918004731.3295870-1-raj.khem@gmail.com/]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: John Stultz <jstultz@google.com>
+Cc: Shuah Khan <shuah@kernel.org>
+---
+ tools/testing/selftests/timers/valid-adjtimex.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c
+index d500884801d8..ff4ff8b1d127 100644
+--- a/tools/testing/selftests/timers/valid-adjtimex.c
++++ b/tools/testing/selftests/timers/valid-adjtimex.c
+@@ -39,7 +39,11 @@
+ #include <sys/syscall.h>
+ int clock_adjtime(clockid_t id, struct timex *tx)
+ {
++#if !defined(__NR_clock_adjtime) && defined(__NR_clock_adjtime64)
++       return syscall(__NR_clock_adjtime64, id, tx);
++#else
+        return syscall(__NR_clock_adjtime, id, tx);
++#endif
+ }
+ 
+ 
diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-oe/recipes-kernel/kpatch/kpatch.inc
index 4d187200ec..b8ef092262 100644
--- a/meta-oe/recipes-kernel/kpatch/kpatch.inc
+++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc
@@ -22,7 +22,6 @@ EXTRA_OEMAKE = " \
         CC='${CC}' \
         "
 
-S = "${WORKDIR}/git"
 
 do_install () {
         oe_runmake install
diff --git a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
index ba3983e6ff..6521830b7a 100644
--- a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
+++ b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
@@ -6,6 +6,5 @@ SRCREV = "0c3c21930895f6582a5c9d9d797f7e11ff41ffb2"
 
 PV = "0.9.1"
 
-S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch
new file mode 100644
index 0000000000..954b1393db
--- /dev/null
+++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch
@@ -0,0 +1,36 @@
+From ca95e956307672484e8c018263600749aa9c4f4d Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Wed, 9 Apr 2025 11:14:52 +1000
+Subject: [PATCH] tlshd: Define ALLPERMS if it doesn't exist to fix musl build
+
+ALLPERMS exists in glibc, but not on musl, so we manually define
+it if it doesn't exist. This fixes building on musl systems.
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/88]
+---
+ src/tlshd/config.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/tlshd/config.c b/src/tlshd/config.c
+index 38948e8..e653bd8 100644
+--- a/src/tlshd/config.c
++++ b/src/tlshd/config.c
+@@ -46,6 +46,14 @@
+ 
+ static GKeyFile *tlshd_configuration;
+ 
++/**
++ * ALLPERMS exists in glibc, but not on musl, so we
++ * manually define it if it doesn't exist
++ */
++#ifndef ALLPERMS
++#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
++#endif
++
+ /**
+  * tlshd_config_init - Read tlshd's config file
+  * @pathname: Pathname to config file
+-- 
+2.49.0
+
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
new file mode 100644
index 0000000000..6aabb77ee8
--- /dev/null
+++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils/0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch
@@ -0,0 +1,36 @@
+From d170b04dcb8b2b28e370d8b18ffa1f593e8eec11 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Thu, 10 Apr 2025 13:15:16 +1000
+Subject: [PATCH] tlshd: configure.ac: Use AC_CHECK_HEADER instead of
+ AC_CHECK_FILE
+
+AC_CHECK_FILE doesn't work when cross-compiling [1], which breaks a lot of
+use cases (like OpenEmbedded for one). Autoconf supports AC_CHECK_HEADER
+which can be used instead and is more robust [2] so let's use that
+instead.
+
+1: https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Files.html
+2: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Generic-Headers.html
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Submitted [https://github.com/oracle/ktls-utils/pull/90]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2c77fb1..c790d71 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ PKG_CHECK_MODULES([LIBNL_GENL3], libnl-genl-3.0 >= 3.1)
+ AC_SUBST([LIBNL_GENL3_CFLAGS])
+ AC_SUBST([LIBNL_GENL3_LIBS])
+ 
+-AC_CHECK_FILE([/usr/include/linux/quic.h],
++AC_CHECK_HEADER([linux/quic.h],
+               [AC_CHECK_LIB([gnutls], [gnutls_handshake_set_secret_function],
+                             [AC_DEFINE([HAVE_GNUTLS_QUIC], [1], [Define to 1 if QUIC is found.])])])
+ 
+-- 
+2.49.0
+
diff --git a/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb
new file mode 100644
index 0000000000..1a90dcf998
--- /dev/null
+++ b/meta-oe/recipes-kernel/ktls-utils/ktls-utils_1.0.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "TLS handshake utilities for in-kernel TLS consumers"
+DESCRIPTION = "In-kernel TLS consumers need a mechanism to perform TLS \
+handshakes on a connected socket to negotiate TLS session parameters that \
+can then be programmed into the kernel's TLS record protocol engine."
+DEPENDS = "gnutls keyutils glib-2.0 libnl"
+RDEPENDS:${PN} += " gnutls"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d568123389d9a12625cca2b089b1728b"
+
+SRCREV = "c787cd26330af457e1ca9cf43232db2c71c03154"
+SRC_URI = " \
+        git://github.com/oracle/ktls-utils.git;nobranch=1;protocol=https \
+        file://0001-tlshd-Define-ALLPERMS-if-it-doesn-t-exist-to-fix-mus.patch \
+        file://0002-tlshd-configure.ac-Use-AC_CHECK_HEADER-instead-of-AC.patch \
+        "
+
+
+inherit autotools-brokensep pkgconfig systemd
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
+PACKAGECONFIG[systemd] = "--with-systemd,,systemd"
+
+SYSTEMD_SERVICE:${PN} = "tlshd.service"
diff --git a/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch b/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch
new file mode 100644
index 0000000000..873995b644
--- /dev/null
+++ b/meta-oe/recipes-kernel/libbpf/files/0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch
@@ -0,0 +1,43 @@
+From ff2eb6e134ebfc225b97b46182af3cc58ed481f6 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 10 Apr 2025 11:50:04 +0800
+Subject: [PATCH] libbpf: check for empty BTF data section in btf_parse_elf
+
+A valid ELF file may contain a SHT_NOBITS .BTF section. This case is
+not handled correctly in btf_parse_elf, which leads to a segfault.
+
+Add a null check for a buffer returned by elf_getdata() before
+proceeding with its processing.
+
+Bug report: https://github.com/libbpf/libbpf/issues/894
+
+Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
+Acked-by: Mykyta Yatsenko <mykyta.yatsenko5@gmail.com>
+
+Upstream-Status: Backport [https://github.com/kernel-patches/bpf-rc/commit/b02b669fd9398d246c8c9ae901c0d8f5bb36a588]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ btf.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/btf.c b/btf.c
+index e9673c0e..21d38dcf 100644
+--- a/btf.c
++++ b/btf.c
+@@ -1199,6 +1199,12 @@ static struct btf *btf_parse_elf(const char *path, struct btf *base_btf,
+                goto done;
+        }
+ 
++       if (!secs.btf_data->d_buf) {
++               pr_warn("BTF data is empty in %s\n", path);
++               err = -ENODATA;
++               goto done;
++       }
++
+        if (secs.btf_base_data) {
+                dist_base_btf = btf_new(secs.btf_base_data->d_buf, secs.btf_base_data->d_size,
+                                        NULL);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch b/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch
new file mode 100644
index 0000000000..ebfcb94a2f
--- /dev/null
+++ b/meta-oe/recipes-kernel/libbpf/files/CVE-2025-29481.patch
@@ -0,0 +1,102 @@
+From 806b4e0a9f658d831119cece11a082ba1578b800 Mon Sep 17 00:00:00 2001
+From: Viktor Malik <vmalik@redhat.com>
+Date: Tue, 15 Apr 2025 17:50:14 +0200
+Subject: [PATCH] libbpf: Fix buffer overflow in bpf_object__init_prog
+
+As shown in [1], it is possible to corrupt a BPF ELF file such that
+arbitrary BPF instructions are loaded by libbpf. This can be done by
+setting a symbol (BPF program) section offset to a large (unsigned)
+number such that <section start + symbol offset> overflows and points
+before the section data in the memory.
+
+Consider the situation below where:
+- prog_start = sec_start + symbol_offset    <-- size_t overflow here
+- prog_end   = prog_start + prog_size
+
+    prog_start        sec_start        prog_end        sec_end
+        |                |                 |              |
+        v                v                 v              v
+    .....................|################################|............
+
+The report in [1] also provides a corrupted BPF ELF which can be used as
+a reproducer:
+
+    $ readelf -S crash
+    Section Headers:
+      [Nr] Name              Type             Address           Offset
+           Size              EntSize          Flags  Link  Info  Align
+    ...
+      [ 2] uretprobe.mu[...] PROGBITS         0000000000000000  00000040
+           0000000000000068  0000000000000000  AX       0     0     8
+
+    $ readelf -s crash
+    Symbol table '.symtab' contains 8 entries:
+       Num:    Value          Size Type    Bind   Vis      Ndx Name
+    ...
+         6: ffffffffffffffb8   104 FUNC    GLOBAL DEFAULT    2 handle_tp
+
+Here, the handle_tp prog has section offset ffffffffffffffb8, i.e. will
+point before the actual memory where section 2 is allocated.
+
+This is also reported by AddressSanitizer:
+
+    =================================================================
+    ==1232==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x7c7302fe0000 at pc 0x7fc3046e4b77 bp 0x7ffe64677cd0 sp 0x7ffe64677490
+    READ of size 104 at 0x7c7302fe0000 thread T0
+        #0 0x7fc3046e4b76 in memcpy (/lib64/libasan.so.8+0xe4b76)
+        #1 0x00000040df3e in bpf_object__init_prog /src/libbpf/src/libbpf.c:856
+        #2 0x00000040df3e in bpf_object__add_programs /src/libbpf/src/libbpf.c:928
+        #3 0x00000040df3e in bpf_object__elf_collect /src/libbpf/src/libbpf.c:3930
+        #4 0x00000040df3e in bpf_object_open /src/libbpf/src/libbpf.c:8067
+        #5 0x00000040f176 in bpf_object__open_file /src/libbpf/src/libbpf.c:8090
+        #6 0x000000400c16 in main /poc/poc.c:8
+        #7 0x7fc3043d25b4 in __libc_start_call_main (/lib64/libc.so.6+0x35b4)
+        #8 0x7fc3043d2667 in __libc_start_main@@GLIBC_2.34 (/lib64/libc.so.6+0x3667)
+        #9 0x000000400b34 in _start (/poc/poc+0x400b34)
+
+    0x7c7302fe0000 is located 64 bytes before 104-byte region [0x7c7302fe0040,0x7c7302fe00a8)
+    allocated by thread T0 here:
+        #0 0x7fc3046e716b in malloc (/lib64/libasan.so.8+0xe716b)
+        #1 0x7fc3045ee600 in __libelf_set_rawdata_wrlock (/lib64/libelf.so.1+0xb600)
+        #2 0x7fc3045ef018 in __elf_getdata_rdlock (/lib64/libelf.so.1+0xc018)
+        #3 0x00000040642f in elf_sec_data /src/libbpf/src/libbpf.c:3740
+
+The problem here is that currently, libbpf only checks that the program
+end is within the section bounds. There used to be a check
+`while (sec_off < sec_sz)` in bpf_object__add_programs, however, it was
+removed by commit 6245947c1b3c ("libbpf: Allow gaps in BPF program
+sections to support overriden weak functions").
+
+Add a check for detecting the overflow of `sec_off + prog_sz` to
+bpf_object__init_prog to fix this issue.
+
+[1] https://github.com/lmarch2/poc/blob/main/libbpf/libbpf.md
+
+Fixes: 6245947c1b3c ("libbpf: Allow gaps in BPF program sections to support overriden weak functions")
+Reported-by: lmarch2 <2524158037@qq.com>
+Signed-off-by: Viktor Malik <vmalik@redhat.com>
+Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
+Reviewed-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
+Link: https://github.com/lmarch2/poc/blob/main/libbpf/libbpf.md
+Link: https://lore.kernel.org/bpf/20250415155014.397603-1-vmalik@redhat.com
+
+CVE: CVE-2025-29481
+Upstream-Status: Backport [https://github.com/libbpf/libbpf/commit/806b4e0a9f658d831119cece11a082ba1578b800]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/libbpf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libbpf.c b/src/libbpf.c
+index b2591f5..56250b5 100644
+--- a/src/libbpf.c
++++ b/src/libbpf.c
+@@ -889,7 +889,7 @@ bpf_object__add_programs(struct bpf_object *obj, Elf_Data *sec_data,
+                        return -LIBBPF_ERRNO__FORMAT;
+                }
+ 
+-               if (sec_off + prog_sz > sec_sz) {
++               if (sec_off + prog_sz > sec_sz || sec_off + prog_sz < sec_off) {
+                        pr_warn("sec '%s': program at offset %zu crosses section boundary\n",
+                                sec_name, sec_off);
+                        return -LIBBPF_ERRNO__FORMAT;
diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.5.0.bb
index 928482ba36..36312c386b 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.5.0.bb
@@ -8,13 +8,16 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2"
-SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master \
+           file://0001-libbpf-check-for-empty-BTF-data-section-in-btf_parse.patch \
+           file://CVE-2025-29481.patch;striplevel=2 \
+"
+SRCREV = "09b9e83102eb8ab9e540d36b4559c55f3bcdb95d"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 EXTRA_OEMAKE += "DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir}"
 EXTRA_OEMAKE:append:class-native = " UAPIDIR=${includedir}"
diff --git a/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb b/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb
index be0659ad2a..f87502930e 100644
--- a/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb
+++ b/meta-oe/recipes-kernel/libpfm/libpfm4_4.13.0.bb
@@ -26,7 +26,7 @@ EXTRA_OEMAKE:append:powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\""
 EXTRA_OEMAKE:append:powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\""
 EXTRA_OEMAKE:append:aarch64 = " ARCH=\"arm64\""
 
-S = "${WORKDIR}/libpfm-${PV}"
+S = "${UNPACKDIR}/libpfm-${PV}"
 
 do_install () {
         oe_runmake install
diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
index c90ac19fa7..6b9e8b9b38 100644
--- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb
+++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb
@@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97
 SECTION = "libs"
 DEPENDS = "libtraceevent bison-native flex-native"
 
-SRCREV = "67f3b2ab9f836e6c9c70c94db7aac3251119a263"
+SRCREV = "417c2e3aa21af670cc5c13db633dd35292f2d0fa"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \
            file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \
            "
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
deleted file mode 100644
index 96a996f616..0000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 6d16911316cb576db0239f607e60918a222e4436 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Sun, 24 Apr 2022 17:25:33 +0800
-Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
-
-* Create alias for target such as powerpc as powerpc32
-* Remove hardcode CFLAGS
-* Add CFLAGS_COMMON to instead of CFLAGS so can flexibly
-  customize CFLAGS and not hardcode the CFLAGS as previously
-* Forcibly to link dynamic library as the poky build
-  system doesn't build static library by default
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
-[2021-11-18] Patch updated to use CFLAGS_COMMON for zstd
-Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-
-Rebase to 1.7.1
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- Makefile | 40 +++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 71d8548..22acdd5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
- CC     = gcc
- endif
- 
--CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
--               -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--CFLAGS      := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
--CFLAGS_ARCH := $(CFLAGS_BASE)
--# LDFLAGS = -L/usr/local/lib -I/usr/local/include
--
- HOST_ARCH := $(shell uname -m)
- # Use TARGET as the target architecture if specified.
- # Defaults to uname -m
-@@ -24,26 +18,34 @@ endif
- ARCH := $(shell echo ${TARGET}  | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
-                               -e s/arm.*/arm/ -e s/sa110/arm/ \
-                               -e s/s390x/s390/ -e s/parisc64/parisc/ \
--                              -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/)
-+                              -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \
-+                              -e s/_powerpc_/_powerpc32_/)
- 
- CROSS :=
- ifneq ($(TARGET), $(HOST_ARCH))
- CROSS := -U__$(HOST_ARCH)__
- endif
- 
--CFLAGS += -D__$(ARCH)__ $(CROSS)
- CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS)
- 
--ifeq ($(ARCH), powerpc64)
--CFLAGS += -m64
-+ifeq ($(ARCH), __powerpc64__)
- CFLAGS_ARCH += -m64
- endif
- 
--ifeq ($(ARCH), powerpc32)
--CFLAGS += -m32
-+ifeq ($(ARCH), __powerpc32__)
- CFLAGS_ARCH += -m32
- endif
- 
-+CFLAGS_ARCH += $(CFLAGS) \
-+              -D_FILE_OFFSET_BITS=64 \
-+              -D_LARGEFILE_SOURCE \
-+              -D_LARGEFILE64_SOURCE
-+
-+CFLAGS_COMMON = $(CFLAGS_ARCH) \
-+              -DVERSION='"$(VERSION)"' \
-+              -DRELEASE_DATE='"$(DATE)"'
-+
-+
- SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
- SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c detect_cycle.c
- OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
-@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
- 
- LIBS = -ldw -lbz2 -ldl -lelf -lz
- ifneq ($(LINKTYPE), dynamic)
--LIBS := -static $(LIBS) -llzma
-+LIBS := $(LIBS) -llzma
- endif
- 
- ifeq ($(USELZO), on)
- LIBS := -llzo2 $(LIBS)
--CFLAGS += -DUSELZO
-+CFLAGS_COMMON += -DUSELZO
- endif
- 
- ifeq ($(USESNAPPY), on)
-@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS)
- ifneq ($(LINKTYPE), dynamic)
- LIBS := $(LIBS) -lstdc++
- endif
--CFLAGS += -DUSESNAPPY
-+CFLAGS_COMMON += -DUSESNAPPY
- endif
- 
- ifeq ($(USEZSTD), on)
- LIBS := -lzstd $(LIBS)
--CFLAGS += -DUSEZSTD
-+CFLAGS_COMMON += -DUSEZSTD
- endif
- 
- ifeq ($(DEBUG), on)
-@@ -104,14 +106,14 @@ LIBS := $(LIBS) $(call try-run,\
- all: makedumpfile
- 
- $(OBJ_PART): $(SRC_PART)
--       $(CC) $(CFLAGS) -c -o ./$@ $(VPATH)$(@:.o=.c)
-+       $(CC) $(CFLAGS_COMMON) -c -o ./$@ $(VPATH)$(@:.o=.c)
- 
- $(OBJ_ARCH): $(SRC_ARCH)
-        @mkdir -p $(@D)
-        $(CC) $(CFLAGS_ARCH) -c -o ./$@ $(VPATH)$(@:.o=.c)
- 
- makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
--       $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
-+       $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
-        @sed -e "s/@DATE@/$(DATE)/" \
-             -e "s/@VERSION@/$(VERSION)/" \
-             $(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8
-@@ -120,7 +122,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
-             $(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5
- 
- eppic_makedumpfile.so: extension_eppic.c
--       $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
-+       $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
- 
- clean:
-        rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
deleted file mode 100644
index 85b44c4941..0000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "VMcore extraction tool"
-DESCRIPTION = "\
-    This program is used to extract a subset of the memory available either \
-    via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \
-    images without extra uneeded information (zero pages, userspace programs, \
-    etc). \
-"
-HOMEPAGE = "https://github.com/makedumpfile/makedumpfile"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-LICENSE = "GPL-2.0-only"
-
-SRCBRANCH ?= "master"
-SRCREV = "c266469347d49287be38059d45e7aaa454db9cb2"
-
-DEPENDS = "bzip2 zlib elfutils xz"
-RDEPENDS:${PN}-tools = "perl ${PN}"
-
-# mips/rv32 would not compile.
-COMPATIBLE_HOST:mipsarcho32 = "null"
-COMPATIBLE_HOST:riscv32 = "null"
-
-PACKAGES =+ "${PN}-tools"
-FILES:${PN}-tools = "${bindir}/*.pl"
-
-SRC_URI = "\
-    git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \
-    file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
-"
-
-S = "${WORKDIR}/git"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
-
-SECTION = "base"
-
-# If we do not specify TARGET, makedumpfile will build for the host but use the
-# target gcc.
-#
-
-MAKEDUMPFILE_TARGET ?= "${TARGET_ARCH}"
-MAKEDUMPFILE_TARGET:powerpc = "ppc"
-
-EXTRA_OEMAKE = "\
-    LINKTYPE=static \
-    TARGET=${MAKEDUMPFILE_TARGET} \
-    ${PACKAGECONFIG_CONFARGS} \
-"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo"
-PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy"
-PACKAGECONFIG[zstd] = "USEZSTD=on,USEZSTD=off,zstd"
-
-do_install () {
-    mkdir -p ${D}/usr/bin
-    install -m 755 ${S}/makedumpfile ${D}/usr/bin
-    install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin
-
-    mkdir -p ${D}/etc/
-    install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample
-}
diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
index 90e847c137..4073381899 100644
--- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
+++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \
            file://0001-corestripper-Fix-uninitialized-warning.patch \
            "
 
-S = "${WORKDIR}/git"
 
 SYSTEMD_SERVICE:${PN} = "minicoredumper.service"
 SYSTEMD_AUTO_ENABLE = "enable"
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
index 56981d96fa..e28903d6ba 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
@@ -1,4 +1,4 @@
-From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001
+From 468850b5d39435025633df14dda3d48651d9ec29 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Tue, 18 Jun 2019 17:10:15 +0800
 Subject: [PATCH] Makefile: fix multilib build failure
@@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: fix multilib build failure
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+
+Refresh to 5.13
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- Makefile | 50 +++++++++++++++++++++++++++-----------------------
- 1 file changed, 27 insertions(+), 23 deletions(-)
+ Makefile | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8455415..4aa0786 100644
+index 337c53e..58e3779 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,30 +1,34 @@
- # SPDX-License-Identifier: GPL-2.0
- PREFIX         ?= /usr
- DESTDIR                ?=
-+BASELIB                ?=
+@@ -25,6 +25,7 @@ BINDIR ?=     /usr/bin
+ MANDIR ?=      /usr/share/man
+ SHRDIR ?=      /usr/share/pm-graph
+ LIBDIR ?=      /usr/lib
++BASELIB        ?=
  
+ # Toolchain: what tools do we use, and what options do they need:
+ INSTALL = /usr/bin/install
+@@ -33,6 +34,9 @@ INSTALL_DATA  = ${INSTALL} -m 644
  all:
         @echo "Nothing to build"
  
@@ -27,63 +33,34 @@ index 8455415..4aa0786 100644
 +       @echo "Nothing to clean"
 +
  install : uninstall
--       install -d  $(DESTDIR)$(PREFIX)/lib/pm-graph
--       install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
--       install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph
--       install -d  $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
--       install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
-+       install -d  $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
-+       install -d  $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
-+       install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+        $(INSTALL) -d  $(DESTDIR)$(LIBDIR)/pm-graph
+        $(INSTALL) sleepgraph.py $(DESTDIR)$(LIBDIR)/pm-graph
+@@ -54,10 +58,10 @@ install : uninstall
+        $(INSTALL) -d  $(DESTDIR)$(SHRDIR)
  
-        install -d  $(DESTDIR)$(PREFIX)/bin
--       ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
--       ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
-+       ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph
-+       ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph
+        $(INSTALL) -d  $(DESTDIR)$(BINDIR)
+-       ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
+-       ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
+-       ln -s ../lib/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
+-       $(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
++       ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
++       ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
++       ln -s ../$(BASELIB)/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
++       #$(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
  
-        install -d  $(DESTDIR)$(PREFIX)/share/man/man8
-        install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8
-@@ -37,11 +41,11 @@ uninstall :
-        rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph
-        rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph
+        $(INSTALL) -d  $(DESTDIR)$(MANDIR)/man8
+        $(INSTALL) bootgraph.8 $(DESTDIR)$(MANDIR)/man8
+@@ -90,8 +94,8 @@ hwcheck-install :
+        rm -f $(DESTDIR)$(LIBDIR)/pm-graph/hwcheck.py
+        $(INSTALL) tools/hwcheck.py $(DESTDIR)$(LIBDIR)/pm-graph
+        $(INSTALL) -d  $(DESTDIR)$(BINDIR)
+-       ln -s ../lib/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
+-       $(DESTDIR)$(BINDIR)/hwcheck cronon
++       ln -s ../$(BASELIB)/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
++       #$(DESTDIR)$(BINDIR)/hwcheck cronon
  
--       rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/*
--       if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \
--               rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \
-+       rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/*
-+       if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \
-+               rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \
-        fi;
--       rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/*
--       if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \
--               rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \
-+       rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/*
-+       if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \
-+               rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \
-        fi;
+ hwcheck-uninstall :
+        if [ -e $(DESTDIR)$(BINDIR)/hwcheck ] ; then \
 -- 
-2.17.1
+2.25.1
 
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
deleted file mode 100644
index f7f8bc0687..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 47a1db21f6c5d17c94c58c3fe0dcce35c623dbf4 Mon Sep 17 00:00:00 2001
-From: Liwei Song <liwei.song@windriver.com>
-Date: Tue, 23 Jun 2020 04:47:20 +0000
-Subject: [PATCH] sleepgraph: add support for RT kernel ftrace flags
-
-with PREEMPT_RT enabled in kernel, ftrace have a different
-flags format:
-
-                   _-----=> irqs-off
-                  / _----=> need-resched
-                 | / _----=> need-resched
-                 || / _---=> hardirq/softirq
-                 ||| / _--=> preempt-depth
-                 ||||/     delay
-TASK-PID   CPU#  |||||   TIMESTAMP  FUNCTION
-   | |       |   |||||      |         |
-
-add support for this.
-
-Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/18]
-
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
----
- sleepgraph.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sleepgraph.py b/sleepgraph.py
-index cfed8e09e0e6..561f165cf9be 100755
---- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -2689,7 +2689,7 @@ class TestProps:
-                '[ +!#\*@$]*(?P<dur>[0-9\.]*) .*\|  (?P<msg>.*)'
-        ftrace_line_fmt_nop = \
-                ' *(?P<proc>.*)-(?P<pid>[0-9]*) *\[(?P<cpu>[0-9]*)\] *'+\
--               '(?P<flags>.{4}) *(?P<time>[0-9\.]*): *'+\
-+               '(?P<flags>.{4,7}) *(?P<time>[0-9\.]*): *'+\
-                '(?P<msg>.*)'
-        def __init__(self):
-                self.stamp = ''
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
deleted file mode 100644
index fc5991d464..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9bbc991a927722439cad38c892fc9f57207089d3 Mon Sep 17 00:00:00 2001
-From: Liwei Song <liwei.song@windriver.com>
-Date: Mon, 24 May 2021 08:27:28 +0000
-Subject: [PATCH] sleepgraph.py: parse unfished cpu exec line
-
-exist the below case in ftrace file:
-sleepgraph-6508    [003] .... 18197.824037: tracing_mark_write: ps - xxx..., lock_torture_wr-94 169,lock_torture_wr-95 143,lock_tort
-sleepgraph-6508    [003] .... 18197.824043: tracing_mark_write: ure_wr-96 189,lock_torture_wr-97 174,lock_torture_wr-98 160,lock_torture_st-99 1
-
-lock_torture_wr-96 was split to different line due to limited buffer
-size(1k) set in kernel, check this case and re-parse the unfinished
-line.
-
-Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/20]
-
-Signed-off-by: Liwei Song <liwei.song@windriver.com>
----
- sleepgraph.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/sleepgraph.py b/sleepgraph.py
-index e340d5b3f03b..38b4439db8eb 100755
---- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -3365,8 +3365,21 @@ def parseTraceLog(live=False):
-                                        val = ps.split()
-                                        if not val:
-                                                continue
--                                       name = val[0].replace('--', '-')
--                                       proclist[name] = int(val[1])
-+                                       if not len(val) < 2:
-+                                               name = val[0].replace('--', '-')
-+                                               proclist[name] = int(val[1])
-+                                       else:
-+                                               proclist = dict()
-+                                               nextline = next(tf)
-+                                               mcont = re.match(tp.ftrace_line_fmt, nextline)
-+                                               n = m.group('ps') + mcont.group('msg').split(': ')[1]
-+                                               for pscont in n.split(','):
-+                                                       val = pscont.split()
-+                                                       if not val:
-+                                                               continue
-+                                                       if not len(val) < 2:
-+                                                               name = val[0].replace('--', '-')
-+                                                               proclist[name] = int(val[1])
-                                data.pstl[t.time] = proclist
-                                continue
-                # find the end of resume
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
deleted file mode 100644
index 25c87093f6..0000000000
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 11 Sep 2019 11:31:07 +0800
-Subject: [PATCH] sleepgraph.py: use python3
-
-Already compatible with Python 3.
-Same goes for bootgraph.py
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- bootgraph.py  | 2 +-
- sleepgraph.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bootgraph.py b/bootgraph.py
-index d3b99a1..efb5714 100755
---- a/bootgraph.py
-+++ b/bootgraph.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # SPDX-License-Identifier: GPL-2.0-only
- #
- # Tool for analyzing boot timing
-diff --git a/sleepgraph.py b/sleepgraph.py
-index 1794c79..cfed8e0 100755
---- a/sleepgraph.py
-+++ b/sleepgraph.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- # SPDX-License-Identifier: GPL-2.0-only
- #
- # Tool for analyzing suspend/resume timing
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
index 6e52a58de5..219629d4d7 100644
--- a/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb
+++ b/meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
@@ -5,14 +5,10 @@ HOMEPAGE = "https://01.org/pm-graph"
 LICENSE  = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
-SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6"
+SRCREV = "0987732b013936ad771334f51cba31c453c8a9c9"
 SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \
            file://0001-Makefile-fix-multilib-build-failure.patch \
-           file://0001-sleepgraph.py-use-python3.patch \
-           file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \
-           file://0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch \
 "
-S = "${WORKDIR}/git"
 
 # Apart from the listed RDEPENDS, analyze-suspend depends on some features
 # provided by the kernel. These options are:
@@ -22,12 +18,14 @@ S = "${WORKDIR}/git"
 #   - CONFIG_FUNCTION_TRACER=y
 #   - CONFIG_FUNCTION_GRAPH_TRACER=y
 
-COMPATIBLE_HOST='(i.86|x86_64).*'
-EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}"
+COMPATIBLE_HOST = '(i.86|x86_64).*'
+EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${libdir} BASELIB=${baselib}"
 
 do_install() {
-        oe_runmake install
-        install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
+    oe_runmake install
+    install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
+
+    rm -rf ${D}${libdir}/pm-graph/__pycache__
 }
 
 RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression"
diff --git a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
index 2e8c5cbb8d..7b87dd28df 100644
--- a/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
+++ b/meta-oe/recipes-kernel/spidev-test/spidev-test.bb
@@ -6,7 +6,7 @@ PROVIDES = "virtual/spidev-test"
 
 inherit bash-completion kernelsrc kernel-arch
 
-do_populate_lic[depends] += "virtual/kernel:do_patch"
+do_populate_lic[depends] += "virtual/kernel:do_shared_workdir"
 
 EXTRA_OEMAKE = "-C ${S}/tools/spi O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}"
 
diff --git a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
index 11c4037b23..6782dec228 100644
--- a/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
+++ b/meta-oe/recipes-kernel/trace-cmd/trace-cmd_3.1.5.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;b
            file://0001-Do-not-emit-useless-rpath.patch"
 SRCREV = "18233e4c32857cb7ddd4960beeec8360ed834fc5"
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "libtraceevent libtracefs zstd xmlto-native asciidoc-native swig-native bison-native flex-native"
 
diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat.bb
index 4770fae50e..f65699865e 100644
--- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
+++ b/meta-oe/recipes-kernel/turbostat/turbostat.bb
@@ -16,12 +16,14 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b
 COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
+KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}"
+inherit linux-kernel-base
+
 SRC_URI += "\
             file://COPYING \
             "
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "libcap"
@@ -33,7 +35,7 @@ do_populate_lic[depends] = "${PN}:do_configure"
 
 
 EXTRA_OEMAKE = '\
-                CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \
+                CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}'  \
                '
 
 # If we build under STAGING_KERNEL_DIR, source will not be put
@@ -52,12 +54,21 @@ do_configure:prepend() {
                 cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S}
                 cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S}
         fi
+        if [ -f "${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h" ]; then
+                cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h ${S}
+        fi
+        cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler.h ${S}
+        cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler_types.h ${S}
+        cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler-gcc.h ${S}
         cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S}
 }
 
 
 do_compile() {
         sed -i 's#<linux/bits.h>#"bits.h"#' msr-index.h
+        sed -i 's#<linux/compiler.h>#"compiler.h"#' build_bug.h
+        sed -i 's#<linux/compiler_types.h>#"compiler_types.h"#' compiler.h
+        sed -i 's#<linux/compiler-gcc.h>#"compiler-gcc.h"#' compiler_types.h
         'TMPCHECK='grep "<vdso/const.h>" bits.h'' || true
         if [ -n $TMPCHECK ]; then
                 sed -i 's#<vdso/const.h>#"const.h"#' bits.h
@@ -66,8 +77,15 @@ do_compile() {
                 sed -i 's#<linux/const.h>#"const.h"#' bits.h
                 sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h
         fi
+        echo '#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))' >> msr-index.h
+        echo "#define BIT(x) (1 << (x))" > bits.h
+        echo "#define BIT_ULL(nr) (1ULL << (nr))" >> bits.h
+        echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> bits.h
+        echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> bits.h
+
         sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c
         sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c
+        sed -i 's#BUILD_BUG_HEADER#"build_bug.h"#' turbostat.c
         sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile
         oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR}
 }
@@ -75,3 +93,7 @@ do_compile() {
 do_install() {
         oe_runmake DESTDIR="${D}" install
 }
+
+python do_package:prepend() {
+    d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
+}
diff --git a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb
index e7e4ca50af..aae17a9fd7 100644
--- a/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb
+++ b/meta-oe/recipes-kernel/usbip-tools/usbip-tools.bb
@@ -28,7 +28,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 # We need to set S, for not being set to STAGING_KERNEL_DIR, and by that
 # be wiped when we prune dest below. We just set it to usbip-tools-1.0
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 
 # Copy the source files from KERNEL/tools/usb/usbip to ${S}
 do_configure[prefuncs] += "copy_usbip_source_from_kernel"