69 files changed, 588 insertions, 2139 deletions
diff --git a/classes/uefi-comboapp.bbclass b/classes/uefi-comboapp.bbclass
deleted file mode 100644
index a05e0ca0..00000000
--- a/classes/uefi-comboapp.bbclass
+++ /dev/null
@@ -1,151 +0,0 @@
-# This class brings a more generic version of the UEFI combo app from refkit to meta-intel.
-# It uses a combo file, containing kernel, initramfs and
-# command line, presented to the BIOS as UEFI application, by prepending
-# it with the efi stub obtained from systemd-boot.
-# Don't add syslinux or build an ISO
-PCBIOS:forcevariable = "0"
-NOISO:forcevariable  = "1"
-# image-live.bbclass will default INITRD_LIVE to the image INITRD_IMAGE creates.
-# We want behavior to be consistent whether or not "live" is in IMAGE_FSTYPES, so
-# we default INITRD_LIVE to the INITRD_IMAGE as well.
-INITRD_IMAGE ?= "core-image-minimal-initramfs"
-INITRD_LIVE ?= " ${@ ('${DEPLOY_DIR_IMAGE}/' + d.getVar('INITRD_IMAGE', expand=True) + '-${MACHINE}.cpio.gz') if d.getVar('INITRD_IMAGE', True) else ''}"
-do_uefiapp[depends] += " \
-                         intel-microcode:do_deploy \
-                         systemd-boot:do_deploy \
-                         virtual/kernel:do_deploy \
-                       "
-# INITRD_IMAGE is added to INITRD_LIVE, which we use to create our initrd, so depend on it if it is set
-do_uefiapp[depends] += "${@ '${INITRD_IMAGE}:do_image_complete' if d.getVar('INITRD_IMAGE') else ''}"
-# The image does without traditional bootloader.
-# In its place, instead, it uses a single UEFI executable binary, which is
-# composed by:
-#   - an UEFI stub
-#     The linux kernel can generate a UEFI stub, however the one from systemd-boot can fetch
-#     the command line from a separate section of the EFI application, avoiding the need to
-#     rebuild the kernel.
-#   - the kernel
-#   - an initramfs (optional)
-def create_uefiapp(d, uuid=None, app_suffix=''):
-    import glob, re
-    from subprocess import check_call
-    build_dir = d.getVar('B')
-    deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE')
-    image_link_name = d.getVar('IMAGE_LINK_NAME')
-    cmdline = '%s/cmdline.txt' % build_dir
-    linux = '%s/%s' % (deploy_dir_image, d.getVar('KERNEL_IMAGETYPE'))
-    initrd = '%s/initrd' % build_dir
-    stub_path = '%s/linux*.efi.stub' % deploy_dir_image
-    stub = glob.glob(stub_path)[0]
-    m = re.match(r"\S*(ia32|x64)(.efi)\S*", os.path.basename(stub))
-    app = "boot%s%s%s" % (m.group(1), app_suffix, m.group(2))
-    executable = '%s/%s.%s' % (deploy_dir_image, image_link_name, app)
-    if d.getVar('INITRD_LIVE'):
-        with open(initrd, 'wb') as dst:
-            for cpio in d.getVar('INITRD_LIVE').split():
-                with open(cpio, 'rb') as src:
-                    dst.write(src.read())
-        initrd_cmd = "--add-section .initrd=%s --change-section-vma .initrd=0x3000000 " % initrd
-    else:
-        initrd_cmd = ""
-    root = 'root=PARTUUID=%s' % uuid if uuid else ''
-    with open(cmdline, 'w') as f:
-        f.write('%s %s' % (d.getVar('APPEND'), root))
-    objcopy_cmd = ("objcopy "
-        "--add-section .cmdline=%s --change-section-vma .cmdline=0x30000 "
-        "--add-section .linux=%s --change-section-vma .linux=0x40000 "
-        "%s %s %s") % \
-        (cmdline, linux, initrd_cmd, stub, executable)
-    check_call(objcopy_cmd, shell=True)
-python create_uefiapps () {
-    # We must clean up anything that matches the expected output pattern, to ensure that
-    # the next steps do not accidentally use old files.
-    import glob
-    pattern = d.expand('${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot*.efi')
-    for old_efi in glob.glob(pattern):
-        os.unlink(old_efi)
-    uuid = d.getVar('DISK_SIGNATURE_UUID')
-    create_uefiapp(d, uuid=uuid)
-}
-# This is intentionally split into different parts. This way, derived
-# classes or images can extend the individual parts. We can also use
-# whatever language (shell script or Python) is more suitable.
-python do_uefiapp() {
-    bb.build.exec_func('create_uefiapps', d)
-}
-do_uefiapp[vardeps] += "APPEND DISK_SIGNATURE_UUID INITRD_LIVE KERNEL_IMAGETYPE IMAGE_LINK_NAME"
-uefiapp_deploy_at() {
-    dest=$1
-    for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot*.efi; do
-        target=`basename $i`
-        target=`echo $target | sed -e 's/${IMAGE_LINK_NAME}.//'`
-        cp  --preserve=timestamps -r $i $dest/$target
-    done
-}
-fakeroot do_uefiapp_deploy() {
-    rm -rf ${IMAGE_ROOTFS}/boot/*
-    dest=${IMAGE_ROOTFS}/boot/EFI/BOOT
-    mkdir -p $dest
-    uefiapp_deploy_at $dest
-}
-do_uefiapp_deploy[depends] += "${PN}:do_uefiapp virtual/fakeroot-native:do_populate_sysroot"
-# This decides when/how we add our tasks to the image
-python () {
-    image_fstypes = d.getVar('IMAGE_FSTYPES', True)
-    initramfs_fstypes = d.getVar('INITRAMFS_FSTYPES', True)
-    # Don't add any of these tasks to initramfs images
-    if initramfs_fstypes not in image_fstypes:
-        bb.build.addtask('uefiapp', 'do_image', 'do_rootfs', d)
-        bb.build.addtask('uefiapp_deploy', 'do_image', 'do_rootfs', d)
-}
-SIGN_AFTER ?= "do_uefiapp"
-SIGN_BEFORE ?= "do_uefiapp_deploy"
-SIGNING_DIR ?= "${DEPLOY_DIR_IMAGE}"
-SIGNING_BINARIES ?= "${IMAGE_LINK_NAME}.boot*.efi"
-inherit uefi-sign
-# Legacy hddimg support below this line
-efi_hddimg_populate() {
-    uefiapp_deploy_at "$1"
-}
-build_efi_cfg() {
-    # The command line is built into the combo app, so this is a null op
-    :
-}
-populate_kernel:append() {
-    # The kernel and initrd are built into the app, so we don't need these
-    if [ -f $dest/initrd ]; then
-        rm $dest/initrd
-    fi
-    if [ -f $dest/vmlinuz ]; then
-        rm $dest/vmlinuz
-    fi
-}
-IMAGE_FEATURES[validitems] += "secureboot"
diff --git a/classes/uefi-sign.bbclass b/classes/uefi-sign.bbclass
deleted file mode 100644
index e8f203b9..00000000
--- a/classes/uefi-sign.bbclass
+++ /dev/null
@@ -1,50 +0,0 @@
-# By default, sign all .efi binaries in ${B} after compiling and before deploying
-SIGNING_DIR ?= "${B}"
-SIGNING_BINARIES ?= "*.efi"
-SIGN_AFTER ?= "do_compile"
-SIGN_BEFORE ?= "do_deploy"
-python () {
-    import os
-    import hashlib
-    # Ensure that if the signing key or cert change, we rerun the uefiapp process
-    if bb.utils.contains('IMAGE_FEATURES', 'secureboot', True, False, d):
-        for varname in ('SECURE_BOOT_SIGNING_CERT', 'SECURE_BOOT_SIGNING_KEY'):
-            filename = d.getVar(varname)
-            if filename is None:
-                bb.fatal('%s is not set.' % varname)
-            if not os.path.isfile(filename):
-                bb.fatal('%s=%s is not a file.' % (varname, filename))
-            with open(filename, 'rb') as f:
-                data = f.read()
-            hash = hashlib.sha256(data).hexdigest()
-            d.setVar('%s_HASH' % varname, hash)
-            # Must reparse and thus rehash on file changes.
-            bb.parse.mark_dependency(d, filename)
-        bb.build.addtask('uefi_sign', d.getVar('SIGN_BEFORE'), d.getVar('SIGN_AFTER'), d)
-        # Original binary needs to be regenerated if the hash changes since we overwrite it
-        # SIGN_AFTER isn't necessarily when it gets generated, but its our best guess
-        d.appendVarFlag(d.getVar('SIGN_AFTER'), 'vardeps', 'SECURE_BOOT_SIGNING_CERT_HASH SECURE_BOOT_SIGNING_KEY_HASH')
-}
-do_uefi_sign() {
-    if [ -f ${SECURE_BOOT_SIGNING_KEY} ] && [ -f ${SECURE_BOOT_SIGNING_CERT} ]; then
-        for i in `find ${SIGNING_DIR}/ -name '${SIGNING_BINARIES}'`; do
-            sbsign --key ${SECURE_BOOT_SIGNING_KEY} --cert ${SECURE_BOOT_SIGNING_CERT} $i
-            sbverify --cert ${SECURE_BOOT_SIGNING_CERT} $i.signed
-            mv $i.signed $i
-        done
-    fi
-}
-do_uefi_sign[depends] += "sbsigntool-native:do_populate_sysroot"
-do_uefi_sign[vardeps] += "SECURE_BOOT_SIGNING_CERT_HASH \
-                          SECURE_BOOT_SIGNING_KEY_HASH  \
-                          SIGNING_BINARIES SIGNING_DIR  \
-                          SIGN_BEFORE SIGN_AFTER        \
-                         "
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index 9849d0d8..3403b6b6 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -31,6 +31,7 @@ RECIPE_MAINTAINER:pn-libxcam = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-linux-intel-dev = "Naveen Saini <naveen.kumar.saini@intel.com>"
+RECIPE_MAINTAINER:pn-linux-npu-driver = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-lms = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>"
@@ -45,10 +46,6 @@ RECIPE_MAINTAINER:pn-openvino-inference-engine = "Anuj Mittal <anuj.mittal@intel
 RECIPE_MAINTAINER:pn-openvino-model-optimizer = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-openvkl = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-ospray = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER:pn-ovmf-shell-image-enrollkeys = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-rkcommon = "Naveen Saini <naveen.kumar.saini@intel.com>"
-RECIPE_MAINTAINER:pn-sbsigntool-native = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/conf/layer.conf b/conf/layer.conf
index 97dfb897..ebd2f732 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -19,7 +19,7 @@ LAYERRECOMMENDS_intel = "dpdk"
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_intel = "5"
-LAYERSERIES_COMPAT_intel = "kirkstone scarthgap"
+LAYERSERIES_COMPAT_intel = "scarthgap styhead"
 BBFILES_DYNAMIC += " \
    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \
@@ -42,4 +42,4 @@ PREFERRED_PROVIDER_libva-utils ?= "libva-utils"
 PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native"
 PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils"
-# addpylib ${LAYERDIR}/lib oeqa
+addpylib ${LAYERDIR}/lib oeqa
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index 230d0253..c780094f 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -20,10 +20,6 @@ PREFERRED_PROVIDER_libva-utils = "libva-intel-utils"
 PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native"
 PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils"
-LLVM_MAJOR_VERSION = "${@d.getVar('LLVMVERSION').split('.')[0]}"
-PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}"
-PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}"
 XSERVER_X86_ASPEED_AST = "xf86-video-ast \
           "
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
index afea70df..2fa3f627 100644
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
@@ -15,7 +15,7 @@ inherit pkgconfig cmake ptest
 DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 S = "${WORKDIR}/git"
-SRCREV = "ecd7fb6d5a0df6503d1691c1754a684b9c769c16"
+SRCREV = "f5ff0a6de16c130053bec1a1aec3a9b826c66f78"
 SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \
           file://run-ptest \
           "
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch
new file mode 100644
index 00000000..b7fcb3d1
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/f10439aea214984a060566831f63d3aa198ef1b8.patch
@@ -0,0 +1,54 @@
+From f10439aea214984a060566831f63d3aa198ef1b8 Mon Sep 17 00:00:00 2001
+From: Pawel Cieslak <pawel.cieslak@intel.com>
+Date: Tue, 14 May 2024 14:20:24 +0000
+Subject: [PATCH] fix: include <algorithm> where std::find is used
+Related-To: NEO-11375
+Signed-off-by: Pawel Cieslak <pawel.cieslak@intel.com>
+Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/f10439aea214984a060566831f63d3aa198ef1b8]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ .../sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp    | 3 ++-
+ shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp  | 4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+index 6ab1b751d866..8a224752c8fc 100644
+--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2024 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -13,6 +13,7 @@
+ 
+ #include "gtest/gtest.h"
+ 
+#include <algorithm>
+ #include <limits>
+ #include <netlink/handlers.h>
+ 
+diff --git a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
+index 206c272c5bb2..e961248e73a3 100644
+--- a/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
+++ b/shared/test/unit_test/gmm_helper/gmm_resource_info_tests.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2024 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -17,6 +17,8 @@
+ 
+ #include "gtest/gtest.h"
+ 
+#include <algorithm>
+
+ using namespace NEO;
+ 
+ struct MockGmmHandleAllocator : NEO::GmmHandleAllocator {
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
index 60125171..7280ed03 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.05.28454.6.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
@@ -8,13 +8,14 @@ LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
                    file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.05 \
+SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.13 \
           file://disable-werror.patch \
           file://allow-to-find-cpp-generation-tool.patch \
           file://external-ocloc.patch \
+           file://f10439aea214984a060566831f63d3aa198ef1b8.patch \
           "
-SRCREV = "23a9725e62c8181193c90e5e5207507a1f136587"
+SRCREV = "7131387cdbb02d480a225c70daef913a6c024a6e"
 S = "${WORKDIR}/git"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
index 96d828b6..24eb97bd 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.15985.7.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
@@ -6,9 +6,9 @@ hardware architecture."
 LICENSE = "MIT & Apache-2.0"
 LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
                    file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
-                    file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
+                    file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880"
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.15985 \
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.16510 \
           git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
           git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \
           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;nam
 SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
-SRCREV_igc = "6cc111d262e1c3abcf4bc6b6d8a589ebf821a5c0"
+SRCREV_igc = "c2495d45f37fadd963ad22eb0cc1a8235a306775"
-SRCREV_vc = "da892e1982b6c25b9a133f85b4ac97142d8a3def"
+SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd"
 SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
-SRCREV_spirv-headers = "cca08c63cefa129d082abca0302adcb81610b465"
+SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
deleted file mode 100644
index 7e56af75..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require opencl-clang.inc
-SRCREV = "980f1691c5babcf824ee10375a04a0d0c5d7d44a"
-BRANCH = "ocl-open-140"
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb
index 70177c28..de765d6c 100644
--- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb
+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb
@@ -5,9 +5,9 @@ environment, performs static model analysis, and adjusts deep \
 learning models for optimal execution on end-point target devices."
 HOMEPAGE = "https://01.org/openvinotoolkit"
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/0;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/1;lfs=0 \
           "
-SRCREV = "34caeefd07800b59065345d651949efbe8ab6649"
+SRCREV = "f4afc983258bcb2592d999ed6700043fdb58ad78"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
index 270cc84d..ea86bc31 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
@@ -1,4 +1,4 @@
-From c4c049481d48f33319b1d04cad56d622c4eed65f Mon Sep 17 00:00:00 2001
+From 1f6f4e29769adb9d49a3c4831dd2ba61f6ccbdce Mon Sep 17 00:00:00 2001
 From: Yogesh Tyagi <yogesh.tyagi@intel.com>
 Date: Mon, 11 Mar 2024 13:13:32 +0800
 Subject: [PATCH] Makefile: Fix build Issue
@@ -6,14 +6,13 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-In case build directory is different from source, make sure make is able to find the correct input files. 
+In case build directory is different from source, make sure make is able to find the correct input files.
 Fixes:
 | dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml
 | glib-compile-resources --generate-source thermald-resource.gresource.xml
 | Failed to open file “thermald-resource.gresource.xml”: No such file or directory
 Upstream-Status: Submitted
 https://github.com/intel/thermal_daemon/pull/436
@@ -23,10 +22,10 @@ Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/Makefile.am b/Makefile.am
-index a0c051a..772e280 100644
+index dd2ef10..cb19e17 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -95,6 +95,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml
+@@ -97,6 +97,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml
        $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $<
 
 thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml
@@ -34,6 +33,3 @@ index a0c051a..772e280 100644
 +       $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $<
 
 CLEANFILES = $(BUILT_SOURCES)
-- 
-2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
index df242cdf..66765e56 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
           file://0001-Makefile-Fix-build-Issue.patch \
           "
-SRCREV = "3990ce2391e5c07293758c056e09e4f2453691b4"
+SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e"
 S = "${WORKDIR}/git"
 inherit pkgconfig autotools systemd gtk-doc
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
new file mode 100644
index 00000000..2748d7ab
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
@@ -0,0 +1,99 @@
+From b57297c14d94dac9bdef7570b7b33d70b10171f3 Mon Sep 17 00:00:00 2001
+From: Jozef Wludzik <jozef.wludzik@intel.com>
+Date: Tue, 26 Mar 2024 14:43:29 +0100
+Subject: [PATCH 1/2] Fix the compilation warning when using gcc-13 (#25)
+Added missing headers. Fixed compilation error about casting from
+unsigned to signed int.
+Upstream-Status: Backport [https://github.com/intel/linux-npu-driver/commit/4bcbf2abe94eb4d9c083bd616b58e309a82d008a]
+Signed-off-by: Jozef Wludzik <jozef.wludzik@intel.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp | 7 ++++---
+ umd/vpu_driver/include/umd_common.hpp                  | 1 +
+ validation/umd-test/umd_prime_buffers.h                | 9 +++++++--
+ validation/umd-test/utilities/data_handle.h            | 1 +
+ 4 files changed, 13 insertions(+), 5 deletions(-)
+diff --git a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+index f206ebe..682e5b4 100644
+--- a/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+++ b/umd/level_zero_driver/ext/source/graph/vcl_symbols.hpp
+@@ -5,12 +5,13 @@
+  *
+  */
+ 
+-#include <dlfcn.h>
+-#include <memory>
+-
+ #include "vpux_driver_compiler.h"
+ #include "vpu_driver/source/utilities/log.hpp"
+ 
+#include <array>
+#include <dlfcn.h>
+#include <memory>
+
+ class Vcl {
+   public:
+     static Vcl &sym() {
+diff --git a/umd/vpu_driver/include/umd_common.hpp b/umd/vpu_driver/include/umd_common.hpp
+index 0c874a3..5ad9be2 100644
+--- a/umd/vpu_driver/include/umd_common.hpp
+++ b/umd/vpu_driver/include/umd_common.hpp
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
+#include <cstdint>
+ #include <limits>
+ #include <linux/kernel.h>
+ #include <stdexcept>
+diff --git a/validation/umd-test/umd_prime_buffers.h b/validation/umd-test/umd_prime_buffers.h
+index 6f7c7de..ab4814c 100644
+--- a/validation/umd-test/umd_prime_buffers.h
+++ b/validation/umd-test/umd_prime_buffers.h
+@@ -6,12 +6,17 @@
+  */
+ 
+ #pragma once
+
+#include "umd_test.h"
+
+ #include <fcntl.h>
+-#include <linux/kernel.h>
+ #include <linux/dma-buf.h>
+ #include <linux/dma-heap.h>
+#include <linux/kernel.h>
+#include <stdint.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+#include <unistd.h>
+ 
+ #define ALLIGN_TO_PAGE(x) __ALIGN_KERNEL((x), (UmdTest::PAGE_SIZE))
+ 
+@@ -60,7 +65,7 @@ class PrimeBufferHelper {
+             return false;
+ 
+         bufferFd = heapAlloc.fd;
+-        buffers.insert({heapAlloc.fd, {size, nullptr}});
+        buffers.insert({static_cast<int>(heapAlloc.fd), {size, nullptr}});
+         return true;
+     }
+ 
+diff --git a/validation/umd-test/utilities/data_handle.h b/validation/umd-test/utilities/data_handle.h
+index d6e0ec0..5d937b2 100644
+--- a/validation/umd-test/utilities/data_handle.h
+++ b/validation/umd-test/utilities/data_handle.h
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <linux/kernel.h>
+#include <stdint.h>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.43.0
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
new file mode 100644
index 00000000..9fb97354
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
@@ -0,0 +1,110 @@
+From a9f51fd88effb7d324609e692ca7da576d6dad2e Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Tue, 28 May 2024 10:23:42 +0800
+Subject: [PATCH 2/2] Fix compilation failure with GCC-14
+umd/level_zero_driver/core/source/event/event.cpp:65:31: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'?
+|    65 |     associatedJobs.erase(std::remove_if(associatedJobs.begin(),
+|       |                               ^~~~~~~~~
+|       |                               remove_cv
+| umd/vpu_driver/source/command/vpu_command.cpp: In member function 'void VPU::VPUCommand::appendAssociateBufferObject(VPU::VPUBufferObject*)':
+| umd/vpu_driver/source/command/vpu_command.cpp:126:20: error: 'find' is not a member of 'std'; did you mean 'bind'?
+|   126 |     auto it = std::find(bufferObjects.begin(), bufferObjects.end(), bo);
+|       |                    ^~~~
+|       |                    bind
+| umd/vpu_driver/source/command/vpu_command_buffer.cpp: In member function 'bool VPU::VPUCommandBuffer::addCommand(VPU::VPUCommand*, uint64_t&, uint64_t&)':
+| umd/vpu_driver/source/command/vpu_command_buffer.cpp:185:24: error: 'find' is not a member of 'std'; did you mean 'bind'?
+|   185 |         auto it = std::find(bufferHandles.begin(), bufferHandles.end(), bo->getHandle());
+|       |                        ^~~~
+|       |                        bind
+| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:301:32: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'?
+|   301 |                           std::max_element(stride_begin + TENSOR_5D_STRIDE_C, stride_end));
+|       |                                ^~~~~~~~~~~
+|       |                                tuple_element
+| umd/level_zero_driver/ext/source/graph/elf_parser.cpp:315:37: error: 'max_element' is not a member of 'std'; did you mean 'tuple_element'?
+|   315 |         auto max_stride_val = *std::max_element(stride_begin + TENSOR_4D_STRIDE_C, stride_end);
+|       |                                     ^~~~~~~~~~~
+| umd/level_zero_driver/tools/source/metrics/metric.cpp: In member function 'void L0::MetricContext::deactivateMetricGroups(int)':
+| umd/level_zero_driver/tools/source/metrics/metric.cpp:275:38: error: 'remove_if' is not a member of 'std'; did you mean 'remove_cv'?
+|   275 |     activatedMetricGroups.erase(std::remove_if(activatedMetricGroups.begin(),
+|       |                                      ^~~~~~~~~
+|       |                                      remove_cv
+Upstream-Status: Submitted [https://github.com/intel/linux-npu-driver/pull/30]
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ umd/level_zero_driver/core/source/event/event.cpp     | 1 +
+ umd/level_zero_driver/ext/source/graph/elf_parser.cpp | 1 +
+ umd/level_zero_driver/tools/source/metrics/metric.cpp | 1 +
+ umd/vpu_driver/source/command/vpu_command.cpp         | 1 +
+ umd/vpu_driver/source/command/vpu_command_buffer.cpp  | 1 +
+ 5 files changed, 5 insertions(+)
+diff --git a/umd/level_zero_driver/core/source/event/event.cpp b/umd/level_zero_driver/core/source/event/event.cpp
+index a92248f..196d176 100644
+--- a/umd/level_zero_driver/core/source/event/event.cpp
+++ b/umd/level_zero_driver/core/source/event/event.cpp
+@@ -14,6 +14,7 @@
+ 
+ #include <level_zero/ze_api.h>
+ #include <thread>
+#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+index a1c8e14..dfbd61d 100644
+--- a/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+++ b/umd/level_zero_driver/ext/source/graph/elf_parser.cpp
+@@ -21,6 +21,7 @@
+ #include <vpux_headers/metadata.hpp>
+ #include <vpux_elf/types/vpu_extensions.hpp>
+ #include <vpux_elf/utils/error.hpp>
+#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/level_zero_driver/tools/source/metrics/metric.cpp b/umd/level_zero_driver/tools/source/metrics/metric.cpp
+index b67750f..9497311 100644
+--- a/umd/level_zero_driver/tools/source/metrics/metric.cpp
+++ b/umd/level_zero_driver/tools/source/metrics/metric.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include "level_zero_driver/tools/source/metrics/metric.hpp"
+ #include "vpu_driver/source/utilities/log.hpp"
+#include <algorithm>
+ 
+ namespace L0 {
+ 
+diff --git a/umd/vpu_driver/source/command/vpu_command.cpp b/umd/vpu_driver/source/command/vpu_command.cpp
+index f4ca23f..75331d9 100644
+--- a/umd/vpu_driver/source/command/vpu_command.cpp
+++ b/umd/vpu_driver/source/command/vpu_command.cpp
+@@ -14,6 +14,7 @@
+ #include <cstdint>
+ #include <vector>
+ #include <map>
+#include <algorithm>
+ 
+ namespace VPU {
+ 
+diff --git a/umd/vpu_driver/source/command/vpu_command_buffer.cpp b/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+index c4ad052..bbb80ec 100644
+--- a/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+++ b/umd/vpu_driver/source/command/vpu_command_buffer.cpp
+@@ -11,6 +11,7 @@
+ #include "vpu_driver/source/command/vpu_command_buffer.hpp"
+ #include "vpu_driver/source/command/vpu_copy_command.hpp"
+ #include "vpu_driver/source/utilities/log.hpp"
+#include <algorithm>
+ 
+ namespace VPU {
+ 
+-- 
+2.43.0
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb
new file mode 100644
index 00000000..03e409af
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.2.0.bb
@@ -0,0 +1,33 @@
+SUMMARY = "User Mode Driver for Intel® NPU device"
+HOMEPAGE = "https://github.com/intel/linux-npu-driver"
+LICENSE = "MIT & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=37acda99f3f9c108e62d970fe0e08027 \
+                    file://third-party-programs.txt;md5=dbf0d7a91947cccc5410e9760d9acae5 \
+                    file://third_party/vpux_elf/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+SRC_URI = "git://github.com/intel/linux-npu-driver.git;protocol=https;name=linux-npu-driver;branch=main;lfs=1 \
+            git://github.com/openvinotoolkit/npu_plugin_elf.git;protocol=https;destsuffix=git/third_party/vpux_elf;name=vpux-elf;nobranch=1 \
+            git://github.com/jbeder/yaml-cpp.git;protocol=https;destsuffix=git/third_party/yaml-cpp;name=yaml-cpp;nobranch=1 \
+            git://github.com/intel/level-zero-npu-extensions.git;protocol=https;destsuffix=git/third_party/level-zero-vpu-extensions;name=lzvext;nobranch=1 \
+            git://github.com/google/googletest.git;protocol=https;destsuffix=git/third_party/googletest;name=googletest;nobranch=1 \
+            file://0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch \
+            file://0002-Fix-compilation-failure-with-GCC-14.patch \
+        "
+SRCREV_linux-npu-driver = "9d1dd3daa01ebd97a4ac2e8279ddd6e2cb109244"
+SRCREV_vpux-elf = "03878c115d13aa1ce6af5329c5759fc1cc94a3fb"
+SRCREV_yaml-cpp = "0579ae3d976091d7d664aa9d2527e0d0cff25763"
+SRCREV_lzvext = "0e1c471356a724ef6d176ba027a68e210d90939e"
+SRCREV_googletest = "b796f7d44681514f58a683a3a71ff17c94edb0c1"
+SRCREV_FORMAT = "linux-npu-driver_vpux-elf_yaml-cpp_lzvext_googletest"
+S = "${WORKDIR}/git"
+inherit cmake
+DEPENDS = "level-zero"
+PACKAGES =+ "${PN}-firmware ${PN}-tests"
+FILES:${PN}-firmware = "${libdir}/firmware/updates/intel/vpu/*"
+FILES:${PN}-tests = "${bindir}"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
index fb341b01..1eeaf339 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
@@ -4,7 +4,7 @@ intended to graphics application engineers that want to improve the \
 performance of their application."
 HOMEPAGE = "https://github.com/embree/embree"
-LICENSE  = "Apache-2.0 & syrah"
+LICENSE  = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
                    file://third-party-programs.txt;md5=f989f5b74cfff0d45d3ccf0e1366cbdc \
                    file://common/math/transcendental.h;beginline=6;endline=8;md5=73380bb2ab6613b30b8464f114bd0ca8"
@@ -28,3 +28,5 @@ EXTRA_OECMAKE += " \
                  -DEMBREE_ISPC_SUPPORT=ON  \
                  -DEMBREE_ZIP_MODE=OFF  \
                  "
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
deleted file mode 100644
index d1851406..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b8c3bae71e6d3417ade5cb537cb1785fd75a75c8 Mon Sep 17 00:00:00 2001
-From: Razvan Apetroaie <117895604+razvanapetroaie@users.noreply.github.com>
-Date: Tue, 20 Feb 2024 02:28:14 +0200
-Subject: [PATCH] [CPU] Solving the build failure caused by setting the
- "ENABLE_OV_ONNX_FRONTEND" option to "OFF" (#22934)
-### Details:
-See the [ticket
-description](https://jira.devtools.intel.com/browse/CVS-132119). The
-solution was checked only on a local setup on Ubuntu, if there's a way
-to check that using the CI please let me know (or if you could run the
-job and paste the link in the comments I would be grateful).
-Disclaimer: I'm not a CPU plugin developer, so I can't tell for sure if
-this is the ideal fix and no side effects are introduced. Please take
-that into account when reviewing/merging.
-### Tickets:
- - [CVS-132119](https://jira.devtools.intel.com/browse/CVS-132119)
-Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/b8c3bae71e6d3417ade5cb537cb1785fd75a75c8]
-Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
---
- src/plugins/intel_cpu/tests/functional/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-index db5ae8d01c..6941cb528d 100644
--- a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-+++ b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets ov_snipp
- if(ENABLE_OV_ONNX_FRONTEND)
-     list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}")
- else()
-    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
-+    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/custom/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
- endif()
- 
- if(NOT (ARM OR AARCH64))
-- 
-2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
deleted file mode 100644
index d251f21b..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b5dfcf8bc1245e804c847745c237068eb6f19931 Mon Sep 17 00:00:00 2001
-From: Yogesh Tyagi <yogesh.tyagi@intel.com>
-Date: Fri, 15 Mar 2024 16:28:41 +0800
-Subject: [PATCH] cmake: fix build when using sysroot
-When cross-compiling against a sysroot, system headers will not be at a place
-that starts with /usr. Update conditional check to exclude directories
-which have "/usr/include" in them to not add <sysroot>/usr/include as well.
-Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/23486]
-Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
---
- src/cmake/ov_parallel.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake
-index 3793db98e30..819d3410531 100644
--- a/src/cmake/ov_parallel.cmake
-+++ b/src/cmake/ov_parallel.cmake
-@@ -296,7 +296,7 @@ function(ov_set_threading_interface_for TARGET_NAME)
-                 if(include_directories)
-                     foreach(include_directory IN LISTS include_directories)
-                         # cannot include /usr/include headers as SYSTEM
-                        if(NOT "${include_directory}" MATCHES "^/usr.*$")
-+                        if(NOT "${include_directory}" MATCHES ".*/usr/include.*$")
-                             target_include_directories(${TARGET_NAME} SYSTEM
-                                 ${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>)
-                         else()
-- 
-2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
index 7ab31309..7f5b46c6 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -1,11 +1,11 @@
-From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001
+From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:42:57 +0530
-Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process
+Subject: [PATCH] cmake: yocto specific tweaks to the build process
 * Dont try to detect glibc version as that doesn't work when cross compiling.
+* Dont try to detect CXX11_ABI
 * Install sample binaries as well.
-* Dont strip binaries.
 * Dont try to write triggers for CPack. We package ourselves.
 * Fix the installation path for Python modules when baselib = lib64.
@@ -14,17 +14,16 @@ Upstream-Status: Inappropriate
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
 cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
- cmake/developer_package/target_flags.cmake      | 2 +-
+ cmake/developer_package/target_flags.cmake      | 4 ++--
 samples/cpp/CMakeLists.txt                      | 6 +++---
 src/bindings/python/CMakeLists.txt              | 2 +-
- src/bindings/python/wheel/setup.py              | 1 -
+ 4 files changed, 7 insertions(+), 7 deletions(-)
- 5 files changed, 6 insertions(+), 7 deletions(-)
 diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
-index a7c0ec2cf61..40448e8a962 100644
+index 99f11730983..1a1f61fcd3d 100644
 --- a/cmake/developer_package/packaging/rpm/rpm.cmake
 +++ b/cmake/developer_package/packaging/rpm/rpm.cmake
-@@ -154,7 +154,7 @@ ov_rpm_specific_settings()
+@@ -156,7 +156,7 @@ ov_rpm_specific_settings()
 # needed to add triggers for packages with libraries
 set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
 set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
@@ -34,17 +33,26 @@ index a7c0ec2cf61..40448e8a962 100644
 #
 # Functions helpful for packaging your modules with RPM cpack
 diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
-index 29f23e713e1..942dd445b19 100644
+index d047a1aebd9..4e8ca68c60f 100644
 --- a/cmake/developer_package/target_flags.cmake
 +++ b/cmake/developer_package/target_flags.cmake
-@@ -145,4 +145,4 @@ function(ov_glibc_version)
+@@ -149,7 +149,7 @@ function(ov_glibc_version)
     endif()
 endfunction()
 
 -ov_glibc_version()
 +#ov_glibc_version()
+ 
+ #
+ # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler
+@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi)
+     endif()
+ endmacro()
+ 
+-ov_get_glibcxx_use_cxx11_abi()
+#ov_get_glibcxx_use_cxx11_abi()
 diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index c814cc37e2c..431e7bd2ed3 100644
+index 4d33bff944e..3e7f1458578 100644
 --- a/samples/cpp/CMakeLists.txt
 +++ b/samples/cpp/CMakeLists.txt
 @@ -206,9 +206,9 @@ macro(ov_add_sample)
@@ -61,30 +69,18 @@ index c814cc37e2c..431e7bd2ed3 100644
     # create global target with all samples / demo apps
     if(NOT TARGET ov_samples)
 diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
-index 58ff9b74302..4763994ba56 100644
+index 6cf43ec3fed..d539b9d003f 100644
 --- a/src/bindings/python/CMakeLists.txt
 +++ b/src/bindings/python/CMakeLists.txt
-@@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING)
+@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING)
-     endif()
+     # install OpenVINO Python API
 
     set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
 -    set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
 +    set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
-     set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
+     set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
-     set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO")
+     set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO")
- 
-diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
-index 4b056912212..5f05d891310 100644
--- a/src/bindings/python/wheel/setup.py
-+++ b/src/bindings/python/wheel/setup.py
-@@ -270,7 +270,6 @@ class CustomBuild(build):
-                 self.spawn(["cmake", "--install", binary_dir,
-                                      "--prefix", prefix,
-                                      "--config", CONFIG,
-                                     "--strip",
-                                      "--component", cpack_comp_name])
 
-     def run(self):
 -- 
 2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
index e0967d55..8a1464d5 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
@@ -1,7 +1,7 @@
-From 900eeeb2953095e651270c0f42ccd8b26fd7885c Mon Sep 17 00:00:00 2001
+From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:49:35 +0530
-Subject: [PATCH 3/4] cmake: Fix overloaded-virtual error
+Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error
 * Remove -Werror for:
 |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=]
@@ -16,10 +16,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
-index b0c66a435d6..a3037147cc2 100644
+index 2f3d9127dde..2fd4f5c1b3c 100644
 --- a/src/plugins/intel_gpu/CMakeLists.txt
 +++ b/src/plugins/intel_gpu/CMakeLists.txt
-@@ -38,7 +38,7 @@ add_subdirectory(thirdparty)
+@@ -47,7 +47,7 @@ add_subdirectory(thirdparty)
 include(thirdparty/cmake/rapidjson.cmake)
 
 if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
index 59095133..bbdeaa2a 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
@@ -1,7 +1,7 @@
-From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001
+From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:55:19 +0530
-Subject: [PATCH 4/4] protobuf: allow target protoc to be built
+Subject: [PATCH 3/3] protobuf: allow target protoc to be built
 We can run target binaries using a qemu wrapper so allow these to be
 built and run.
@@ -15,10 +15,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 2 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
-index 49c5b881030..2a1ea8562bc 100644
+index f3b5520d6d2..7579f638c5a 100644
 --- a/cmake/developer_package/frontends/frontends.cmake
 +++ b/cmake/developer_package/frontends/frontends.cmake
-@@ -143,7 +143,7 @@ macro(ov_add_frontend)
+@@ -163,7 +163,7 @@ macro(ov_add_frontend)
         set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h)
         add_custom_command(
                 OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
@@ -28,10 +28,10 @@ index 49c5b881030..2a1ea8562bc 100644
                 COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}"
                 VERBATIM
 diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt
-index 4b6d6da87f3..409e492a5b3 100644
+index 15f32601f23..36853caf7dc 100644
 --- a/thirdparty/protobuf/CMakeLists.txt
 +++ b/thirdparty/protobuf/CMakeLists.txt
-@@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen
+@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE)
 if(CMAKE_CROSSCOMPILING OR
     (APPLE AND (HOST_X86_64 AND AARCH64)) OR
     (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
index 495a4786..a9422e70 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=mast
           file://0001-use-oe-gflags.patch \
           "
-SRCREV = "37f60eb7fe1dcdedc552b2fb184d646723ed5e80"
+SRCREV = "cf5141dad2a4f24e1c5d5b9d43219ed804c48bbf"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -44,11 +44,11 @@ do_install(){
        install -d ${D}${bindir}
        install -d ${D}${datadir}/openvino/open-model-zoo/tools
        install -d ${D}${datadir}/openvino/open-model-zoo/demos
-        cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir}
+        cp -rf ${B}/intel64/Release/*.a ${D}${libdir}
-        cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
+        cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir}
-        cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
+        cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
+        cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
 }
 FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
index 94edd1b8..675d9920 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
 deep learning models through a high-level C++ Inference Engine API \
 integrated with application logic."
-SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/0;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/1;lfs=0 \
           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \
           git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \
           git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
@@ -16,16 +16,15 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=ope
           git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \
           git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \
           git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \
+           git://github.com/openvinotoolkit/telemetry.git;protocol=https;destsuffix=git/thirdparty/telemetry;name=telemetry;nobranch=1;lfs=0 \
           file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \
-           file://0003-cmake-Fix-overloaded-virtual-error.patch \
+           file://0002-cmake-Fix-overloaded-virtual-error.patch \
-           file://0004-protobuf-allow-target-protoc-to-be-built.patch \
+           file://0003-protobuf-allow-target-protoc-to-be-built.patch \
-           file://0001-cmake-fix-build-when-using-sysroot.patch \
-           file://0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch \
           "
-SRCREV_openvino = "34caeefd07800b59065345d651949efbe8ab6649"
+SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78"
-SRCREV_mkl = "f82148befdbdc9576ec721c9d500155ee4de8060"
+SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3"
-SRCREV_onednn = "494af5f9921bdae98f1a0e2955fa7d76ff386c4f"
+SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c"
 SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
 SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
 SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e"
@@ -35,7 +34,8 @@ SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851"
 SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94"
 SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488"
 SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d"
-SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas"
+SRCREV_telemetry = "58e16c257a512ec7f451c9fccf9ff455065b285b"
+SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas_telemetry"
 LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
@@ -50,6 +50,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
                    file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \
                    file://node-addon-api-src/LICENSE.md;md5=0492ef29a9d558a3e9660e7accc9ca6a \
+                    file://thirdparty/telemetry/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
 "
 inherit cmake python3native pkgconfig qemu
@@ -74,6 +75,7 @@ EXTRA_OECMAKE += " \
                  -DENABLE_SYSTEM_FLATBUFFERS=ON \
                  -DENABLE_SYSTEM_SNAPPY=ON \
                  -DFETCHCONTENT_BASE_DIR="${S}" \
+                  -DENABLE_INTEL_NPU=OFF \
                  "
 DEPENDS += "\
@@ -133,6 +135,7 @@ FILES:${PN}-samples = "${datadir}/openvino \
                       ${libdir}/libformat_reader.a \
                       ${libdir}/libopencv_c_wrapper.a \
                       "
 RDEPENDS:${PN}-samples += "python3-core"
 # Package for inference engine python API
diff --git a/lib/oeqa/selftest/cases/secureboot.py b/lib/oeqa/selftest/cases/secureboot.py
deleted file mode 100644
index 4c059e25..00000000
--- a/lib/oeqa/selftest/cases/secureboot.py
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env python
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Copyright (c) 2017, Intel Corporation.
-# All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# AUTHORS
-# Mikko Ylinen <mikko.ylinen@linux.intel.com>
-#
-# Based on meta/lib/oeqa/selftest/* and meta-refkit/lib/oeqa/selftest/*
-"""Test cases for secure boot with QEMU running OVMF."""
-import os
-import unittest
-import re
-import glob
-from shutil import rmtree, copy
-from oeqa.core.decorator.depends import OETestDepends
-from oeqa.selftest.case import OESelftestTestCase
-from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu
-class SecureBootTests(OESelftestTestCase):
-    """Secure Boot test class."""
-    ovmf_keys_enrolled = False
-    ovmf_qemuparams = ''
-    ovmf_dir = ''
-    test_image_unsigned = 'secureboot-selftest-image-unsigned'
-    test_image_signed = 'secureboot-selftest-image-signed'
-    correct_key = 'refkit-db'
-    incorrect_key = 'incorrect'
-    @classmethod
-    def setUpLocal(self):
-        if not SecureBootTests.ovmf_keys_enrolled:
-            bitbake('ovmf ovmf-shell-image-enrollkeys', output_log=self.logger)
-            bb_vars = get_bb_vars(['TMPDIR', 'DEPLOY_DIR_IMAGE'])
-            SecureBootTests.ovmf_dir = os.path.join(bb_vars['TMPDIR'], 'oeselftest', 'secureboot', 'ovmf')
-            bb.utils.mkdirhier(SecureBootTests.ovmf_dir)
-            # Copy (all) OVMF in a temporary location
-            for src in glob.glob('%s/ovmf.*' % bb_vars['DEPLOY_DIR_IMAGE']):
-                copy(src, SecureBootTests.ovmf_dir)
-            SecureBootTests.ovmf_qemuparams = '-drive if=pflash,format=qcow2,file=%s/ovmf.secboot.qcow2' % SecureBootTests.ovmf_dir
-            cmd = ("runqemu "
-                   "qemuparams='%s' "
-                   "ovmf-shell-image-enrollkeys wic intel-corei7-64 "
-                   "nographic slirp") % SecureBootTests.ovmf_qemuparams
-            print('Running "%s"' % cmd)
-            status = runCmd(cmd)
-            if not re.search('info: success', status.output, re.M):
-                self.fail('Failed to enroll keys. EFI shell log:\n%s' % status.output)
-            else:
-                # keys enrolled in ovmf.secboot.vars
-                SecureBootTests.ovmf_keys_enrolled = True
-    @classmethod
-    def tearDownLocal(self):
-        # Seems this is mandatory between the tests (a signed image is booted
-        # when running test_boot_unsigned_image after test_boot_signed_image).
-        # bitbake('-c clean %s' % test_image, output_log=self.logger)
-        #
-        # Whatever the problem was, it no longer seems to be necessary, so
-        # we can skip the time-consuming clean + full rebuild (5:04 min instead
-        # of 6:55min here).
-        pass
-    @classmethod
-    def tearDownClass(self):
-        bitbake('ovmf-shell-image-enrollkeys:do_cleanall', output_log=self.logger)
-        rmtree(self.ovmf_dir, ignore_errors=True)
-    def secureboot_with_image(self, boot_timeout=300, signing_key=None):
-        """Boot the image with UEFI SecureBoot enabled and see the result. """
-        config = ""
-        if signing_key:
-            test_image = self.test_image_signed
-            config += 'SECURE_BOOT_SIGNING_KEY = "${THISDIR}/files/%s.key"\n' % signing_key
-            config += 'SECURE_BOOT_SIGNING_CERT = "${THISDIR}/files/%s.crt"\n' % signing_key
-        else:
-            test_image = self.test_image_unsigned
-        self.write_config(config)
-        bitbake(test_image, output_log=self.logger)
-        self.remove_config(config)
-        # Some of the cases depend on the timeout to expire. Allow overrides
-        # so that we don't have to wait 1000s which is the default.
-        overrides = {
-            'TEST_QEMUBOOT_TIMEOUT': boot_timeout,
-            }
-        print('Booting %s' % test_image)
-        try:
-            with runqemu(test_image, ssh=False,
-                          runqemuparams='nographic slirp',
-                          qemuparams=self.ovmf_qemuparams,
-                          overrides=overrides,
-                          image_fstype='wic') as qemu:
-                cmd  = 'uname -a'
-                status, output = qemu.run_serial(cmd)
-                self.assertTrue(status, 'Could not run \'uname -a\' (status=%s):\n%s' % (status, output))
-                # if we got this far without a correctly signed image, something went wrong
-                if signing_key != self.correct_key:
-                    self.fail('The image not give a Security violation when expected. Boot log:\n%s' % output)
-        except Exception:
-            # Currently runqemu() fails if 'login:' prompt is not seen and it's
-            # not possible to login as 'root'. Those conditions aren't met when
-            # booting to EFI shell (See [YOCTO #11438]). We catch the failure
-            # and parse the boot log to determine the success. Note: the
-            # timeout triggers verbose bb.error() but that's normal with some
-            # of the test cases.
-            workdir = get_bb_var('WORKDIR', test_image)
-            bootlog = "%s/testimage/qemu_boot_log" % workdir
-            with open(bootlog, "r") as log:
-                # This isn't right but all we can do at this point. The right
-                # approach would run commands in the EFI shell to determine
-                # the BIOS rejects unsigned and/or images signed with keys in
-                # dbx key store but that needs changes in oeqa framework.
-                output = log.read()
-                # PASS if we see a security violation on unsigned or incorrectly signed images, otherwise fail
-                if signing_key == self.correct_key:
-                    self.fail('Correctly signed image failed to boot. Boot log:\n%s' % output)
-                elif not re.search('Security Violation', output):
-                    self.fail('The image not give a Security violation when expected. Boot log:\n%s' % output)
-    def test_boot_unsigned_image(self):
-        """ Boot unsigned image with secureboot enabled in UEFI."""
-        self.secureboot_with_image(boot_timeout=120, signing_key=None)
-    @OETestDepends(['secureboot.SecureBootTests.test_boot_unsigned_image'])
-    def test_boot_incorrectly_signed_image(self):
-        """ Boot (correctly) signed image with secureboot enabled in UEFI."""
-        self.secureboot_with_image(boot_timeout=120, signing_key=self.incorrect_key)
-    @OETestDepends(['secureboot.SecureBootTests.test_boot_incorrectly_signed_image'])
-    def test_boot_correctly_signed_image(self):
-        """ Boot (correctly) signed image with secureboot enabled in UEFI."""
-        self.secureboot_with_image(boot_timeout=150, signing_key=self.correct_key)
diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb
index 31e9344b..df459d72 100644
--- a/recipes-core/libxcam/libxcam_1.5.0.bb
+++ b/recipes-core/libxcam/libxcam_1.5.0.bb
@@ -30,7 +30,7 @@ PACKAGECONFIG[dnn]    = "--enable-dnn, --disable-dnn,"
 do_install:append () {
    install -d ${D}${bindir}/libxcam
-    cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/
+    cp -r ${B}/tests/.libs/* ${D}${bindir}/libxcam/
 }
 FILES:${PN} += "${libdir}/gstreamer-*/*.so"
diff --git a/recipes-core/microcode/intel-microcode_20240312.bb b/recipes-core/microcode/intel-microcode_20240531.bb
index 00b18231..4dc39742 100644
--- a/recipes-core/microcode/intel-microcode_20240312.bb
+++ b/recipes-core/microcode/intel-microcode_20240531.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721"
 SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \
           "
-SRCREV = "41af34500598418150aa298bb04e7edacc547897"
+SRCREV = "5278dfcf98e89098326b3eb8a85d07120a8730f8"
 DEPENDS = "iucode-tool-native"
 S = "${WORKDIR}/git"
diff --git a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch b/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch
deleted file mode 100644
index 7eb3bc69..00000000
--- a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From b2099e7184d48a6d05c8713b6fd5dac0e2e70963 Mon Sep 17 00:00:00 2001
-From: Mikko Ylinen <mikko.ylinen@linux.intel.com>
-Date: Wed, 2 Mar 2022 10:55:35 +0800
-Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot
-This patch adds refkit-db.cer (via xxd -i) in OVMF's db
-signature database when used with EnrollDefaultKeys EFI
-application. It's used for testing purposes only.
-Images signed with refkit-db keys are allowed to boot.
-Upstream-Status: Inappropriate
-Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- OvmfPkg/EnrollDefaultKeys/AuthData.c          | 69 +++++++++++++++++++
- OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c |  3 +
- OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h |  2 +
- 3 files changed, 74 insertions(+)
-diff --git a/OvmfPkg/EnrollDefaultKeys/AuthData.c b/OvmfPkg/EnrollDefaultKeys/AuthData.c
-index 53ee7f7003..127131cd05 100644
--- a/OvmfPkg/EnrollDefaultKeys/AuthData.c
-+++ b/OvmfPkg/EnrollDefaultKeys/AuthData.c
-@@ -395,6 +395,75 @@ CONST UINT8  mMicrosoftUefiCa[] = {
- 
- CONST UINTN  mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa;
- 
-+CONST UINT8 mRefkitTestCA[] = {
-+  0x30, 0x82, 0x02, 0xfb, 0x30, 0x82, 0x01, 0xe3, 0xa0, 0x03, 0x02, 0x01,
-+  0x02, 0x02, 0x09, 0x00, 0xd4, 0xf6, 0x48, 0xc2, 0x68, 0x19, 0x91, 0xac,
-+  0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
-+  0x0b, 0x05, 0x00, 0x30, 0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55,
-+  0x04, 0x03, 0x0c, 0x09, 0x72, 0x65, 0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64,
-+  0x62, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x37, 0x30, 0x34, 0x32, 0x30, 0x31,
-+  0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x34,
-+  0x32, 0x30, 0x31, 0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x30, 0x14, 0x31,
-+  0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x72, 0x65,
-+  0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64, 0x62, 0x30, 0x82, 0x01, 0x22, 0x30,
-+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01,
-+  0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02,
-+  0x82, 0x01, 0x01, 0x00, 0xb4, 0x1c, 0x22, 0xa6, 0x22, 0x01, 0x57, 0xcd,
-+  0xf1, 0x4f, 0xaf, 0x72, 0xe3, 0xd9, 0x01, 0x80, 0x50, 0x55, 0xef, 0x02,
-+  0x5e, 0xeb, 0x99, 0x35, 0xcb, 0x7f, 0x2a, 0x79, 0xff, 0xb5, 0x3e, 0xec,
-+  0x5d, 0x92, 0x06, 0x30, 0x20, 0xe7, 0x95, 0xad, 0xa4, 0x84, 0x2e, 0x3f,
-+  0xfa, 0xd7, 0x46, 0xdd, 0x49, 0xa8, 0xe8, 0xe3, 0x79, 0x49, 0xf6, 0x8f,
-+  0x0b, 0x1d, 0xfe, 0x63, 0xa8, 0xd1, 0x63, 0xa3, 0xd6, 0x0d, 0x4e, 0x6c,
-+  0x66, 0x5c, 0xd6, 0x66, 0x26, 0xd1, 0x26, 0x98, 0xd4, 0x4f, 0x76, 0xc9,
-+  0x65, 0x48, 0x58, 0x13, 0x08, 0x31, 0xbc, 0xe5, 0x47, 0x25, 0x65, 0x95,
-+  0x39, 0x89, 0x5f, 0x02, 0xf1, 0xc5, 0x06, 0x17, 0x58, 0xca, 0x09, 0xfd,
-+  0xf6, 0x1e, 0xc5, 0x97, 0xda, 0xa3, 0x4e, 0x1a, 0x48, 0xbe, 0xcf, 0x96,
-+  0x27, 0x04, 0x4b, 0xb7, 0x6d, 0x67, 0xb6, 0x50, 0x18, 0x04, 0x73, 0x51,
-+  0xd2, 0x6a, 0x2d, 0xdf, 0x3b, 0xab, 0xf2, 0x2d, 0x95, 0xd7, 0xa8, 0xb8,
-+  0xa8, 0x30, 0xa1, 0xab, 0x8b, 0x92, 0x2b, 0x60, 0x3e, 0x3a, 0xe5, 0x86,
-+  0x40, 0x71, 0xc1, 0x3f, 0x2d, 0x2e, 0x90, 0xe7, 0xd6, 0xec, 0xcc, 0xc2,
-+  0x0b, 0x79, 0x83, 0x71, 0x6d, 0xf6, 0xa3, 0xa9, 0x4c, 0xcd, 0x46, 0x81,
-+  0xdc, 0xef, 0xec, 0x51, 0xbe, 0x81, 0x2a, 0xf1, 0x78, 0x73, 0x41, 0xdb,
-+  0x54, 0xce, 0x7c, 0xce, 0xa2, 0xe3, 0x90, 0x4f, 0x45, 0x1a, 0xf9, 0x3d,
-+  0x88, 0xfc, 0x0e, 0xed, 0xd3, 0x69, 0x22, 0x4c, 0xfa, 0x0a, 0x69, 0xd1,
-+  0x48, 0xc0, 0xaa, 0xa9, 0x3a, 0xb3, 0x8f, 0x10, 0x3a, 0x76, 0xa8, 0x0c,
-+  0x7a, 0x3d, 0xd8, 0x79, 0xce, 0x1c, 0x96, 0x62, 0xf4, 0x06, 0xee, 0x47,
-+  0xe8, 0xe0, 0x69, 0x91, 0xae, 0xea, 0x34, 0xcf, 0xda, 0xa8, 0xb4, 0x39,
-+  0x5e, 0xf3, 0x7a, 0xd0, 0x88, 0x48, 0x47, 0x69, 0x02, 0x03, 0x01, 0x00,
-+  0x01, 0xa3, 0x50, 0x30, 0x4e, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e,
-+  0x04, 0x16, 0x04, 0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b,
-+  0x1a, 0x9f, 0x46, 0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd,
-+  0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80,
-+  0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b, 0x1a, 0x9f, 0x46,
-+  0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd, 0x30, 0x0c, 0x06,
-+  0x03, 0x55, 0x1d, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30,
-+  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
-+  0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x8f, 0xd2, 0x84, 0x7c, 0x43,
-+  0x47, 0xca, 0x6b, 0xfd, 0x87, 0x83, 0xd0, 0xef, 0x75, 0xd3, 0x20, 0x52,
-+  0x73, 0x18, 0xaa, 0x32, 0x71, 0xfb, 0xa5, 0xf4, 0xc9, 0x11, 0xa3, 0x68,
-+  0x4d, 0xb7, 0x9d, 0xe6, 0xd9, 0x46, 0x24, 0xdc, 0xc7, 0xc2, 0x3b, 0xf9,
-+  0xb0, 0x98, 0xfc, 0xee, 0x34, 0x6e, 0x10, 0x9b, 0x3d, 0x44, 0x6e, 0x33,
-+  0x09, 0x11, 0xb8, 0x29, 0xd6, 0x2d, 0x06, 0xcf, 0x67, 0x8f, 0x96, 0x85,
-+  0x9d, 0x63, 0x72, 0xbf, 0x64, 0x5f, 0x0d, 0xe3, 0xc9, 0x63, 0x19, 0x71,
-+  0xd4, 0x7d, 0x4c, 0x9c, 0x77, 0x46, 0xda, 0x20, 0x97, 0x6d, 0xbc, 0xdd,
-+  0xc2, 0x1f, 0xf3, 0x40, 0x38, 0x1e, 0xe7, 0xcc, 0x55, 0x05, 0x72, 0xba,
-+  0x24, 0x4f, 0xb3, 0x8a, 0x93, 0x0c, 0x30, 0x60, 0xda, 0x9f, 0x6f, 0x35,
-+  0xf6, 0xfb, 0xb0, 0x1f, 0xb3, 0x00, 0xdd, 0xc4, 0xa6, 0xbc, 0xe2, 0x37,
-+  0xc1, 0xa3, 0xef, 0xd9, 0xa1, 0x86, 0xf9, 0xeb, 0xa4, 0xa5, 0x45, 0x38,
-+  0xff, 0x4e, 0x87, 0x4a, 0x41, 0xcf, 0x6e, 0x69, 0x7e, 0x97, 0xbe, 0x2d,
-+  0x22, 0xbc, 0x8d, 0xa0, 0x1a, 0x21, 0x8f, 0x4b, 0x72, 0x90, 0x01, 0x5c,
-+  0xba, 0xa5, 0x9c, 0x2d, 0xd7, 0x25, 0x24, 0xfc, 0xff, 0x5c, 0x58, 0x14,
-+  0x46, 0x30, 0x09, 0x7c, 0x55, 0x64, 0x83, 0x0b, 0xb9, 0xdf, 0xcf, 0x25,
-+  0xee, 0xec, 0xf7, 0xcb, 0xdb, 0xd1, 0x5b, 0x93, 0x93, 0xc8, 0x8a, 0x10,
-+  0x46, 0xb8, 0xb0, 0x35, 0x1c, 0x6c, 0x0d, 0x8f, 0x03, 0x6a, 0x8f, 0x1b,
-+  0x36, 0x68, 0xf3, 0x53, 0x89, 0x36, 0x5b, 0x21, 0x80, 0xde, 0xe3, 0x92,
-+  0x52, 0x94, 0x97, 0x9d, 0x49, 0x89, 0x7d, 0x3e, 0xde, 0x29, 0x51, 0xba,
-+  0x11, 0xf7, 0xba, 0x01, 0xf7, 0xab, 0xea, 0xc1, 0xa7, 0x2e, 0xa3, 0x4d,
-+  0x65, 0xfd, 0x40, 0x71, 0xf1, 0xe2, 0x3f, 0x6c, 0x28, 0xcb, 0xd3
-+};
-+
-+CONST UINTN mSizeOfRefkitTestCA = sizeof mRefkitTestCA;
-+
- //
- // The Microsoft.UefiSecureBootLogo.Tests.OutOfBoxConfirmDBXisPresent test case
- // of the Secure Boot Logo Test in the Microsoft Hardware Certification Kit
-diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
-index 094e4c821b..0a7eef54dc 100644
--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
-+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
-@@ -702,6 +702,9 @@ ShellAppMain (
-                mMicrosoftUefiCa,
-                mSizeOfMicrosoftUefiCa,
-                &gMicrosoftVendorGuid,
-+               mRefkitTestCA,
-+               mSizeOfRefkitTestCA,
-+               &gEfiCallerIdGuid,
-                NULL
-                );
-   }
-diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
-index 56da9c71d6..8de1dfe4e0 100644
--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
-+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h
-@@ -133,4 +133,6 @@ extern CONST UINTN  mSizeOfMicrosoftUefiCa;
- extern CONST UINT8  mSha256OfDevNull[];
- extern CONST UINTN  mSizeOfSha256OfDevNull;
- 
-+extern CONST UINT8 mRefkitTestCA[];
-+extern CONST UINTN mSizeOfRefkitTestCA;
- #endif /* ENROLL_DEFAULT_KEYS_H_ */
-- 
-2.17.1
diff --git a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb
deleted file mode 100644
index ca3cfc15..00000000
--- a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require recipes-core/ovmf/ovmf-shell-image.bb
-WKS_SEARCH_PATH:append = ":${COREBASE}/meta/recipes-core/ovmf"
-QB_DRIVE_TYPE = "/dev/vd"
-do_image:append() {
-    cat > ${IMAGE_ROOTFS}/startup.nsh << EOF
-EnrollDefaultKeys
-reset
-EOF
-}
diff --git a/recipes-core/ovmf/ovmf_%.bbappend b/recipes-core/ovmf/ovmf_%.bbappend
deleted file mode 100644
index 34a9dd1b..00000000
--- a/recipes-core/ovmf/ovmf_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:"
-SRC_URI:append:intel-x86-common = " \
-        file://0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch \
-"
-PACKAGECONFIG:append:intel-x86-common = " secureboot"
diff --git a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
index 825c1f18..195b3c58 100644
--- a/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
+++ b/recipes-graphics/gmmlib/files/0001-Add-new-DG2-device-IDs-194.patch
@@ -1,4 +1,4 @@
-From 8729d66800995a9b7e693bd78249932bd12383e1 Mon Sep 17 00:00:00 2001
+From 683f3552e7d5089601bb37952641b1c7691cf475 Mon Sep 17 00:00:00 2001
 From: John Machado <john.machado@intel.com>
 Date: Mon, 25 Mar 2024 11:13:27 +0530
 Subject: [PATCH] Add new DG2 device IDs (#194)
@@ -11,10 +11,10 @@ Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
 1 file changed, 4 insertions(+)
 diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
-index 7969779..8e2c955 100644
+index 1264087..e944e1e 100644
 --- a/Source/inc/common/igfxfmid.h
 +++ b/Source/inc/common/igfxfmid.h
-@@ -1932,6 +1932,8 @@ typedef enum __NATIVEGTTYPE
+@@ -1934,6 +1934,8 @@ typedef enum __NATIVEGTTYPE
 #define DEV_ID_56BB                             0x56BB
 #define DEV_ID_56BC                             0x56BC
 #define DEV_ID_56BD                             0x56BD
@@ -22,16 +22,13 @@ index 7969779..8e2c955 100644
 +#define DEV_ID_56BF                             0x56BF
 #define DEV_ID_56C0                             0x56C0
 #define DEV_ID_56C1                             0x56C1
- 
+ #define DEV_ID_56C2                             0x56C2
-@@ -1992,6 +1994,8 @@ typedef enum __NATIVEGTTYPE
+@@ -2001,6 +2003,8 @@ typedef enum __NATIVEGTTYPE
                                       ( d == DEV_ID_5690 )                              ||   \
                                       ( d == DEV_ID_5691 )                              ||   \
                                       ( d == DEV_ID_5692 )                              ||   \
 +                                      ( d == DEV_ID_56BE )                              ||   \
 +                                      ( d == DEV_ID_56BF )                              ||   \
                                       ( d == DEV_ID_56C0 )                              ||   \
+                                      ( d == DEV_ID_56C2 )                              ||   \
                                       ( d == DEV_ID_4F80 )                              ||   \
-                                       ( d == DEV_ID_4F81 )                              ||   \
-- 
-2.34.1
diff --git a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch b/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
deleted file mode 100644
index ab4cb178..00000000
--- a/recipes-graphics/gmmlib/files/0001-Introduce-ARL-H-support-172.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2b267b72d6aaa922861b120da9c1543161797046 Mon Sep 17 00:00:00 2001
-From: John Machado <john.machado@intel.com>
-Date: Fri, 9 Feb 2024 13:10:18 +0530
-Subject: [PATCH] Introduce ARL-H support (#172)
-Upstream-Status: Backport [https://github.com/intel/gmmlib/commit/544a8be6f66631e085c86c453aafd78b0e7f5179]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- Source/inc/common/igfxfmid.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-diff --git a/Source/inc/common/igfxfmid.h b/Source/inc/common/igfxfmid.h
-index 99fc624..19aa505 100644
--- a/Source/inc/common/igfxfmid.h
-+++ b/Source/inc/common/igfxfmid.h
-@@ -1966,6 +1966,11 @@ typedef enum __NATIVEGTTYPE
- // ARL-S
- #define DEV_ID_7D67                             0x7D67
- 
-+// ARL-H
-+#define DEV_ID_7D41                             0x7D41
-+#define DEV_ID_7D51                             0x7D51
-+#define DEV_ID_7DD1                             0x7DD1
-+
- #define MGM_HAS     0
- 
- //#define SDG_HAS      1              //Reserve place for Springdale-G HAS
-@@ -2012,6 +2017,11 @@ typedef enum __NATIVEGTTYPE
- // Macro to identify ARL-S Device ID
- #define GFX_IS_ARL_S(d)  ( ( d == DEV_ID_7D67 ) )
- 
-+// Macro to identify ARL-H Device ID
-+#define GFX_IS_ARL_H(d)  ( ( d == DEV_ID_7D41 )  ||   \
-+                         ( d == DEV_ID_7D51 )    ||   \
-+                         ( d == DEV_ID_7DD1 ))
-+
- //we define the highest cap and lower cap of stepping IDs
- #define SI_REV_ID(lo,hi) (lo | hi<<16)
- 
-- 
-2.40.1
diff --git a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb b/recipes-graphics/gmmlib/gmmlib_22.3.18.bb
index 875fbaf5..134a6461 100644
--- a/recipes-graphics/gmmlib/gmmlib_22.3.15.bb
+++ b/recipes-graphics/gmmlib/gmmlib_22.3.18.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=465fe90caea3edd6a2cecb3f0c28a654"
 SRC_URI = " \
            git://github.com/intel/gmmlib.git;protocol=https;branch=master \
-            file://0001-Introduce-ARL-H-support-172.patch \
            file://0001-Add-new-DG2-device-IDs-194.patch \
            "
-SRCREV = "5fb4180e22695ad4e3c155cf680119913c9f44bc"
+SRCREV = "ac964bdffdda7730e8234511f61016071e63783b"
 S = "${WORKDIR}/git"
diff --git a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb b/recipes-graphics/libva/libva-intel-utils_2.21.0.bb
index 9c26f009..0407aa18 100644
--- a/recipes-graphics/libva/libva-intel-utils_2.20.1.bb
+++ b/recipes-graphics/libva/libva-intel-utils_2.21.0.bb
@@ -14,8 +14,8 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
-SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.20-branch;protocol=https"
+SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.21-branch;protocol=https"
-SRCREV = "2ad888bb463dc9bfb3deb512ec9faf78f1d3bfa8"
+SRCREV = "5a59217d5d288f7671ca18d3764139289d83a93e"
 S = "${WORKDIR}/git"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
diff --git a/recipes-graphics/libva/libva-intel_2.20.0.bb b/recipes-graphics/libva/libva-intel_2.21.0.bb
index c81ed65c..83fb3646 100644
--- a/recipes-graphics/libva/libva-intel_2.20.0.bb
+++ b/recipes-graphics/libva/libva-intel_2.21.0.bb
@@ -17,11 +17,12 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
-SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 \
+SRC_URI = "git://github.com/intel/libva.git;protocol=https;branch=v2.21-branch \
          "
-SRC_URI[sha256sum] = "f72bdb4f48dfe71ad01f1cbefe069672a2c949a6abd51cf3c4d4784210badc49"
-S = "${WORKDIR}/libva-${PV}"
+SRCREV = "0b01aed44ef1a6ad660261284ff266fa812829ef"
+S = "${WORKDIR}/git"
 UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases"
diff --git a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.171.bb
index 3ed1c9bd..d3f32c25 100644
--- a/recipes-graphics/metrics-discovery/metrics-discovery_1.12.170.bb
+++ b/recipes-graphics/metrics-discovery/metrics-discovery_1.12.171.bb
@@ -8,7 +8,7 @@ SECTION = "lib"
 inherit pkgconfig cmake
 S = "${WORKDIR}/git"
-SRCREV = "75b292eb1309e4ea10dce403065ee8ca5bf29ecc"
+SRCREV = "24c4dfd45df1600ca83dfb03217675edc4633ffd"
 SRC_URI = "git://github.com/intel/metrics-discovery.git;branch=master;protocol=https \
          "
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.19.6.bb b/recipes-kernel/intel-ethernet/ixgbe_5.20.3.bb
index 7ef38650..c6a03fd3 100644
--- a/recipes-kernel/intel-ethernet/ixgbe_5.19.6.bb
+++ b/recipes-kernel/intel-ethernet/ixgbe_5.20.3.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db56
 SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \
           "
-SRC_URI[sha256sum] = "a844f1fea8064e30b276792455c3b286c1d7af26731e8f865d4a4e9ed1dcf4ab"
+SRC_URI[sha256sum] = "9e2c6c1b417fe193a65f501293bd1413b7df199a49c38629a6688b6c29041db1"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/"
 UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/"
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.18.7.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.19.4.bb
index b21796c6..c68cf10f 100644
--- a/recipes-kernel/intel-ethernet/ixgbevf_4.18.7.bb
+++ b/recipes-kernel/intel-ethernet/ixgbevf_4.19.4.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db56
 SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \
           "
-SRC_URI[sha256sum] = "90f6cd614008839b6fc748ae0f4ad3503435f8b788318d4f40cfc83c7029025e"
+SRC_URI[sha256sum] = "2df21575d011df586f2aec1bffded027a89a44360920b86399782e0b8a1824a5"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"
 UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/"
diff --git a/recipes-kernel/linux/linux-intel-rt_6.6.bb b/recipes-kernel/linux/linux-intel-rt_6.6.bb
index 342679eb..319918cf 100644
--- a/recipes-kernel/linux/linux-intel-rt_6.6.bb
+++ b/recipes-kernel/linux/linux-intel-rt_6.6.bb
@@ -21,9 +21,9 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
 LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
-LINUX_VERSION ?= "6.6.25"
+LINUX_VERSION ?= "6.6.30"
-SRCREV_machine ?= "f8939454cf9bb7277239bb44e90c99474c599f37"
+SRCREV_machine ?= "ffb1894c2ca4fcb0f5a6b59ddb4e25a1124158cc"
-SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a"
+SRCREV_meta ?= "66bebb6789d02e775d4c93d7ca4bf79c2ead4b28"
 LINUX_KERNEL_TYPE = "preempt-rt"
diff --git a/recipes-kernel/linux/linux-intel_6.6.bb b/recipes-kernel/linux/linux-intel_6.6.bb
index 3b917bfa..5c262f5e 100644
--- a/recipes-kernel/linux/linux-intel_6.6.bb
+++ b/recipes-kernel/linux/linux-intel_6.6.bb
@@ -11,11 +11,13 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
 LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}"
-LINUX_VERSION ?= "6.6.25"
+LINUX_VERSION ?= "6.6.30"
-SRCREV_machine ?= "lts-v6.6.25-linux-240415T215440Z"
+SRCREV_machine ?= "86a43fc66c95e24b7cc9e3adf2f4874b589bf9d5"
-SRCREV_meta ?= "c3d1322fb6ff68cdcf4d7a3c1140d81bfdc1320a"
+SRCREV_meta ?= "66bebb6789d02e775d4c93d7ca4bf79c2ead4b28"
 # Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \
+                            features/security/security.scc \
+                            features/intel-npu/intel-npu.scc"
 UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.6.(\d+)-linux-(\d+)T(\d+)Z)$"
diff --git a/recipes-kernel/linux/linux-intel_6.8.bb b/recipes-kernel/linux/linux-intel_6.8.bb
index 036879db..30343357 100644
--- a/recipes-kernel/linux/linux-intel_6.8.bb
+++ b/recipes-kernel/linux/linux-intel_6.8.bb
@@ -11,10 +11,12 @@ DEPENDS += "elfutils-native openssl-native util-linux-native"
 LINUX_VERSION_EXTENSION ??= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
 LINUX_VERSION ?= "6.8"
-SRCREV_machine ?= "efbae83db36abbbbdb946d4f7bbdfda174107cd2"
+SRCREV_machine ?= "4b78f19d1c451c3738b10d489e67977e97036a7f"
-SRCREV_meta ?= "27907f391a4fc508da21358b13419c6e86926c34"
+SRCREV_meta ?= "d6379f226f25136d9292f09cd7c11921f0bbcd9b"
 # Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \
+                            features/security/security.scc \
+                            features/intel-npu/intel-npu.scc"
 UPSTREAM_CHECK_GITTAGREGEX = "^mainline-tracking-v6.7-rc3-linux-(?P<pver>(\d+)T(\d+)Z)$"
diff --git a/recipes-multimedia/itt/itt_3.24.6.bb b/recipes-multimedia/itt/itt_3.24.7.bb
index 1c4759f9..481fd5be 100644
--- a/recipes-multimedia/itt/itt_3.24.6.bb
+++ b/recipes-multimedia/itt/itt_3.24.7.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/BSD-3-Clause.txt;md5=c551872bcf41ce707df54c7
                    "
 SRC_URI = "git://github.com/intel/ittapi.git;protocol=https;branch=master"
-SRCREV = "ec077431fc725dba590b09b2cec5137878b14783"
+SRCREV = "e20cd6099cb9c5afee0a285781c5cc1d32412f3e"
 S = "${WORKDIR}/git"
 PE = "1"
diff --git a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch b/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch
deleted file mode 100644
index 59fff127..00000000
--- a/recipes-multimedia/libva/files/0004-Add-device-ID-for-ARL.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bb860c0bfe53060925b1dce50da4e6e94cfc8cae Mon Sep 17 00:00:00 2001
-From: huangli2018 <li.h.huang@intel.com>
-Date: Wed, 20 Dec 2023 15:47:43 +0800
-Subject: [PATCH 04/13] Add device ID for ARL
-Add device ID for ARL
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/95cbfce81cafa3c24d9d4601d41a855093bc51fb]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- .../linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp       | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-diff --git a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
-index 426bd795f..7b73dfaff 100644
--- a/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
-+++ b/media_softlet/linux/Xe_M_plus/ddi/media_sysinfo_mtl.cpp
-@@ -1,6 +1,6 @@
- /*===================== begin_copyright_notice ==================================
- 
-Copyright (c) 2022, Intel Corporation
-+Copyright (c) 2023, Intel Corporation
- 
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
-@@ -218,4 +218,13 @@ static struct GfxDeviceInfo arlInfo = {
- };
- 
- static bool arlsDevice7d67 = DeviceInfoFactory<GfxDeviceInfo>::
-    RegisterDevice(0x7D67, &arlInfo);
-\ No newline at end of file
-+    RegisterDevice(0x7D67, &arlInfo);
-+
-+static bool arlhDevice7d51 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x7D51, &arlInfo);
-+
-+static bool arlhDevice7dd1 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x7DD1, &arlInfo);
-+
-+static bool arlhDevice7d41 = DeviceInfoFactory<GfxDeviceInfo>::
-+    RegisterDevice(0x7D41, &arlInfo);
-\ No newline at end of file
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch b/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch
deleted file mode 100644
index a9cd2317..00000000
--- a/recipes-multimedia/libva/files/0005-Add-XR24-support-to-DMABuf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bbd3af94a6146d702909ff7e25b0c0547ecbb895 Mon Sep 17 00:00:00 2001
-From: jlui <jonathan.ming.jun.lui@intel.com>
-Date: Wed, 15 Nov 2023 10:48:34 +0800
-Subject: [PATCH 05/13] Add XR24 support to DMABuf
-This is to enable XR24/BGRX support for DMABuf
-Signed-off-by: Lui, Jonathan Ming Jun <jonathan.ming.jun.lui@intel.com>
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/3910b7029f5416fd0b5972f940c65d0a82c48c7b]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h         | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
-index fdcca8873..2dcf440a4 100644
--- a/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
-+++ b/media_softlet/linux/xe_lpm_plus_r0/vp/ddi/capstable_data_vp_xe_lpm_plus_r0_specific.h
-@@ -55,8 +55,9 @@ static ProfileSurfaceAttribInfo surfaceAttribInfo_VAEntrypointVideoProc_VAProfil
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('4', '2', '2', 'V')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'A')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('B', 'G', 'R', 'A')}}},
-    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, { VA_FOURCC('R', 'G', 'B', 'P')}}},
-+    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'P')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', 'B', 'X')}}},
-+    {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('X', 'R', 'G', 'B')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('P', '0', '1', '0')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC('R', 'G', '2', '4')}}},
-     {VASurfaceAttribPixelFormat, VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE, {VAGenericValueTypeInteger, {VA_FOURCC_ARGB}}},
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch b/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch
deleted file mode 100644
index 5b04201a..00000000
--- a/recipes-multimedia/libva/files/0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 67fb6128adf8fc03d429393e98f0982b42a40e64 Mon Sep 17 00:00:00 2001
-From: Zhang_Xinfeng <carl.zhang@intel.com>
-Date: Wed, 27 Dec 2023 09:59:29 +0800
-Subject: [PATCH 06/12] add INTEL MEDIA ALLOC refineE to specify the memory
- alignment
-this key is used to allocate bigger pages
-env variable INTEL_MEDIA_ALLOC_refineE also could be used
-and was not enabled by default
-mode 0 is default mode
-mode 1 is < 64 align to 64
-mode 2 is > 1M &&  <= 3M align to 1M, >3M align to 2M
-mode 3 is mode 1 & mode 2
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/765dd939dcc5562d18cca18e5eda505bda952797]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../linux/common/os/i915/mos_bufmgr.c         | 75 +++++++++++++++----
- .../common/os/i915_production/mos_bufmgr.c    |  1 +
- .../common/os/mos_context_specific_next.cpp   | 21 +++++-
- .../common/os/mos_user_setting_specific.cpp   |  7 ++
- 4 files changed, 90 insertions(+), 14 deletions(-)
-diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-index c0b3ba027..b623d0129 100644
--- a/media_softlet/linux/common/os/i915/mos_bufmgr.c
-+++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-@@ -138,7 +138,7 @@ struct mos_bufmgr_gem {
-     int exec_count;
- 
-     /** Array of lists of cached gem objects of power-of-two sizes */
-    struct mos_gem_bo_bucket cache_bucket[14 * 4];
-+    struct mos_gem_bo_bucket cache_bucket[64];
-     int num_buckets;
-     time_t time;
- 
-@@ -3852,9 +3852,9 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size)
- }
- 
- static void
-init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
-+init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode)
- {
-    unsigned long size, cache_max_size = 64 * 1024 * 1024;
-+    unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size;
- 
-     /* OK, so power of two buckets was too wasteful of memory.
-      * Give 3 other sizes between each power of two, to hopefully
-@@ -3864,17 +3864,63 @@ init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
-      * width/height alignment and rounding of sizes to pages will
-      * get us useful cache hit rates anyway)
-      */
-    add_bucket(bufmgr_gem, 4096);
-    add_bucket(bufmgr_gem, 4096 * 2);
-    add_bucket(bufmgr_gem, 4096 * 3);
-+    /* alloc_mode 0 is default alloc_mode
-+     * alloc_mode 1 rounding up to 64K for all < 1M
-+     * alloc_mode 2 rounding up to 2M for size> 1M
-+     * alloc_mode 3 rounding up to 2M for size > 1M and 64K for size <= 1M */
-+    if( alloc_mode > 3 )
-+        alloc_mode = 0;
-+
-+    if ( 0 == alloc_mode || 2 == alloc_mode)
-+    {
-+        // < 1M normal alloc_mode
-+        add_bucket(bufmgr_gem, 4096);
-+        add_bucket(bufmgr_gem, 4096 * 2);
-+        add_bucket(bufmgr_gem, 4096 * 3);
-+        /* Initialize the linked lists for BO reuse cache. */
-+        for (size = 4 * 4096; size < 1024 * 1024; size *= 2) {
-+            add_bucket(bufmgr_gem, size);
-+            add_bucket(bufmgr_gem, size + size * 1 / 4);
-+            add_bucket(bufmgr_gem, size + size * 2 / 4);
-+            add_bucket(bufmgr_gem, size + size * 3 / 4);
-+        }
- 
-    /* Initialize the linked lists for BO reuse cache. */
-    for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
-        add_bucket(bufmgr_gem, size);
-+        add_bucket(bufmgr_gem, 1024 * 1024);
-+    }
-+    if (1 == alloc_mode || 3 == alloc_mode)
-+    {
-+        // < 1M 64k alignment
-+        unit_size = 64 * 1024;
-+        for (size = unit_size; size <= 1024 * 1024; size += unit_size)
-+        {
-+            add_bucket(bufmgr_gem, size);
-+        }
-+    }
-+    if( 0 == alloc_mode || 1 == alloc_mode)
-+    {
-+       //> 1M is normal alloc_mode
-+        add_bucket(bufmgr_gem, 1280 * 1024);
-+        add_bucket(bufmgr_gem, 1536 * 1024);
-+        add_bucket(bufmgr_gem, 1792 * 1024);
-+
-+        for (size = 2 * 1024 * 1024; size < cache_max_size; size *= 2) {
-+            add_bucket(bufmgr_gem, size);
-+            add_bucket(bufmgr_gem, size + size * 1 / 4);
-+            add_bucket(bufmgr_gem, size + size * 2 / 4);
-+            add_bucket(bufmgr_gem, size + size * 3 / 4);
-+        }
-+    }
-+    if( 2 == alloc_mode || 3 == alloc_mode)
-+    {
-+       //> 1M rolling to 2M
-+       unit_size = 2 * 1024 * 1024;
-+       add_bucket(bufmgr_gem, unit_size);
-+       add_bucket(bufmgr_gem, 3 * 1024 * 1024);
- 
-        add_bucket(bufmgr_gem, size + size * 1 / 4);
-        add_bucket(bufmgr_gem, size + size * 2 / 4);
-        add_bucket(bufmgr_gem, size + size * 3 / 4);
-+       for (size = 4 * 1024 * 1024; size <= cache_max_size; size += unit_size)
-+       {
-+           add_bucket(bufmgr_gem, size);
-+       }
-     }
- }
- 
-@@ -5100,6 +5146,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-     struct drm_i915_gem_get_aperture aperture;
-     drm_i915_getparam_t gp;
-     int ret, tmp;
-+    uint8_t alloc_mode;
-     bool exec2 = false;
- 
-     pthread_mutex_lock(&bufmgr_list_mutex);
-@@ -5352,10 +5399,12 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-      *
-      * Every 4 was too few for the blender benchmark.
-      */
-+    alloc_mode = (uint8_t)(batch_size & 0xff);
-+    batch_size &= 0xffffff00;
-     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
- 
-     DRMINITLISTHEAD(&bufmgr_gem->named);
-    init_cache_buckets(bufmgr_gem);
-+    init_cache_buckets(bufmgr_gem,alloc_mode);
- 
-     DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list);
- 
-diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
-index 90b5685b1..b3574f7d3 100644
--- a/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
-+++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr.c
-@@ -5403,6 +5403,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-      *
-      * Every 4 was too few for the blender benchmark.
-      */
-+    batch_size &= 0xffffff00;
-     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
- 
-     DRMINITLISTHEAD(&bufmgr_gem->named);
-diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-index 9e9e3ff7e..543e262d1 100644
--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
-+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-@@ -64,6 +64,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
-     uint32_t      iDeviceId = 0;
-     MOS_STATUS    eStatus   = MOS_STATUS_SUCCESS;
-     uint32_t      value     = 0;
-+    uint32_t      mode      = 0;
-     MediaUserSettingSharedPtr   userSettingPtr = nullptr;
- 
-     MOS_OS_FUNCTION_ENTER;
-@@ -89,7 +90,25 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
- 
-         userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext);
- 
-        m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType);
-+        mode = BATCH_BUFFER_SIZE;
-+        ReadUserSetting(
-+            userSettingPtr,
-+            value,
-+            "INTEL MEDIA ALLOC MODE",
-+            MediaUserSetting::Group::Device);
-+
-+        if (value)
-+        {
-+            mode |= (value & 0x000000ff);
-+        }
-+        value = 0;
-+        /* no need to set batch buffer size after switch to softpin
-+         * keep it, just for test during relocation to softpin transition
-+         * now , it could be a debug method , but is actually useless
-+         * so it is safe to reuse the lowest 8bit to convey addtional information
-+         * more suitable solution is deleting it , or add additional parameter*/
-+
-+        m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType);
-         if (nullptr == m_bufmgr)
-         {
-             MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd);
-diff --git a/media_softlet/linux/common/os/mos_user_setting_specific.cpp b/media_softlet/linux/common/os/mos_user_setting_specific.cpp
-index 6be8b4298..caed584f4 100644
--- a/media_softlet/linux/common/os/mos_user_setting_specific.cpp
-+++ b/media_softlet/linux/common/os/mos_user_setting_specific.cpp
-@@ -52,5 +52,12 @@ MOS_STATUS MosUserSetting::InitMosUserSettingSpecific(MediaUserSettingSharedPtr
-         0,
-         true); //"Enable VM Bind."
- 
-+    DeclareUserSettingKey(
-+        userSettingPtr,
-+        "INTEL MEDIA ALLOC MODE",
-+        MediaUserSetting::Group::Device,
-+        0,
-+        false); //
-+
-     return MOS_STATUS_SUCCESS;
- }
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch
deleted file mode 100644
index 459ff490..00000000
--- a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b1aebef4d342c77fc2b9c5efbf20aeb2aa9d634e Mon Sep 17 00:00:00 2001
-From: Wang_Pingli <pingli.wang@intel.com>
-Date: Thu, 28 Dec 2023 16:44:40 +0800
-Subject: [PATCH 07/12] Skip report keys
-Skip to report keys
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/68ce25b0a6fa90614eb4734c8680aa4e149e8323]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../os/osservice/mos_utilities_specific.cpp   | 30 +++++++++++++++++--
- 1 file changed, 28 insertions(+), 2 deletions(-)
-diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-index b5df29f06..96785e21e 100644
--- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-@@ -67,6 +67,8 @@ int32_t g_mosMemoryFailSimulateAllocCounter = 0;
- int32_t *MosUtilities::m_mosAllocMemoryFailSimulateAllocCounter = &g_mosMemoryFailSimulateAllocCounter;
- #endif
- 
-+static bool s_skipToReportReg = false;
-+
- double MosUtilities::MosGetTime()
- {
-     struct timespec ts = {};
-@@ -1551,6 +1553,10 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
-         {
-             std::string id       = "";
- 
-+            static const char *disableReportRegKeyList[] = {
-+                "INTEL MEDIA ALLOC MODE"
-+            };
-+            static const uint32_t disableReportRegKeyListCount = sizeof(disableReportRegKeyList) / sizeof(disableReportRegKeyList[0]);
-             while(!regStream.eof())
-             {
-                 std::string line = "";
-@@ -1585,8 +1591,22 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
-                     {
-                         std::string name = line.substr(0,pos);
-                         std::string value = line.substr(pos+1);
-                        auto        &keys  = regBufferMap[id];
-                        keys[name]       = value;
-+                        if (name.size() > 0 && value.size() > 0)
-+                        {
-+                            auto &keys = regBufferMap[id];
-+                            keys[name] = value;
-+                            if (s_skipToReportReg == false && id == USER_SETTING_CONFIG_PATH)
-+                            {
-+                                for (uint32_t i = 0; i < disableReportRegKeyListCount; i++)
-+                                {
-+                                    if (strcmp(name.c_str(), disableReportRegKeyList[i]) == 0)
-+                                    {
-+                                        s_skipToReportReg = true;
-+                                        break;
-+                                    }
-+                                }
-+                            }
-+                        }
-                     }
-                 }
-             }
-@@ -1606,6 +1626,12 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap &regBufferMap)
- MOS_STATUS MosUtilities::MosUninitializeReg(RegBufferMap &regBufferMap)
- {
-     MOS_STATUS status = MOS_STATUS_SUCCESS;
-+
-+    if (s_skipToReportReg)
-+    {
-+        return MOS_STATUS_SUCCESS;
-+    }
-+
-     if (regBufferMap.size() == 0)
-     {
-         return MOS_STATUS_SUCCESS;
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch b/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch
deleted file mode 100644
index ece5e00b..00000000
--- a/recipes-multimedia/libva/files/0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From ac2ffac8d4aade216cc361c6c7120c13a8780719 Mon Sep 17 00:00:00 2001
-From: "Soon, Thean Siew" <thean.siew.soon@intel.com>
-Date: Thu, 28 Dec 2023 18:42:59 +0000
-Subject: [PATCH 08/12] Limit INTEL MEDIA ALLOC MODE to MTL and ARL only
-Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754]
-Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com>
---
- .../common/os/i915/include/mos_bufmgr_api.h   |  1 +
- .../common/os/i915/include/mos_bufmgr_priv.h  |  2 +-
- .../linux/common/os/i915/mos_bufmgr.c         | 69 +++++++++++++++----
- .../linux/common/os/i915/mos_bufmgr_api.c     | 19 +++++
- .../os/i915_production/mos_bufmgr_priv.h      |  1 +
- .../common/os/mos_context_specific_next.cpp   | 36 +++++-----
- 6 files changed, 94 insertions(+), 34 deletions(-)
-diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
-index 71cc01099..ab4f1ba89 100644
--- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
-+++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_api.h
-@@ -299,6 +299,7 @@ void mos_bufmgr_enable_vmbind(struct mos_bufmgr *bufmgr);
- void mos_bufmgr_disable_object_capture(struct mos_bufmgr *bufmgr);
- int mos_bufmgr_get_memory_info(struct mos_bufmgr *bufmgr, char *info, uint32_t length);
- int mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr);
-+void mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode);
- 
- int mos_bo_map_unsynchronized(struct mos_linux_bo *bo);
- int mos_bo_map_gtt(struct mos_linux_bo *bo);
-diff --git a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
-index 63f69f985..6fd58f827 100644
--- a/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
-+++ b/media_softlet/linux/common/os/i915/include/mos_bufmgr_priv.h
-@@ -358,9 +358,9 @@ struct mos_bufmgr {
-     void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr;
-     int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr;
-     int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr;
-+    void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr;
-     int (*query_engines_count)(struct mos_bufmgr *bufmgr,
-                           unsigned int *nengine) = nullptr;
-    
-     int (*query_engines)(struct mos_bufmgr *bufmgr,
-                           __u16 engine_class,
-                           __u64 caps,
-diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr.c b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-index b623d0129..2814ddbb7 100644
--- a/media_softlet/linux/common/os/i915/mos_bufmgr.c
-+++ b/media_softlet/linux/common/os/i915/mos_bufmgr.c
-@@ -2426,19 +2426,9 @@ mos_gem_bo_start_gtt_access(struct mos_linux_bo *bo, int write_enable)
- }
- 
- static void
-mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
-+mos_bufmgr_cleanup_cache(struct mos_bufmgr_gem *bufmgr_gem)
- {
-    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *) bufmgr;
-    struct drm_gem_close close_bo;
-    int i, ret;
-
-    free(bufmgr_gem->exec2_objects);
-    free(bufmgr_gem->exec_objects);
-    free(bufmgr_gem->exec_bos);
-    pthread_mutex_destroy(&bufmgr_gem->lock);
-
-    /* Free any cached buffer objects we were going to reuse */
-    for (i = 0; i < bufmgr_gem->num_buckets; i++) {
-+    for (int i = 0; i < bufmgr_gem->num_buckets; i++) {
-         struct mos_gem_bo_bucket *bucket =
-             &bufmgr_gem->cache_bucket[i];
-         struct mos_bo_gem *bo_gem;
-@@ -2450,7 +2440,25 @@ mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
- 
-             mos_gem_bo_free(&bo_gem->bo);
-         }
-+        bufmgr_gem->cache_bucket[i].size = 0;
-     }
-+    bufmgr_gem->num_buckets = 0;
-+}
-+
-+static void
-+mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
-+{
-+    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr;
-+    struct drm_gem_close close_bo;
-+    int ret;
-+
-+    free(bufmgr_gem->exec2_objects);
-+    free(bufmgr_gem->exec_objects);
-+    free(bufmgr_gem->exec_bos);
-+    pthread_mutex_destroy(&bufmgr_gem->lock);
-+
-+    /* Free any cached buffer objects we were going to reuse */
-+    mos_bufmgr_cleanup_cache(bufmgr_gem);
- 
-     /* Release userptr bo kept hanging around for optimisation. */
-     if (bufmgr_gem->userptr_active.ptr) {
-@@ -3852,9 +3860,41 @@ add_bucket(struct mos_bufmgr_gem *bufmgr_gem, int size)
- }
- 
- static void
-init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem, uint8_t alloc_mode)
-+init_cache_buckets(struct mos_bufmgr_gem *bufmgr_gem)
-+{
-+    unsigned long size, cache_max_size = 64 * 1024 * 1024;
-+
-+    /* OK, so power of two buckets was too wasteful of memory.
-+     * Give 3 other sizes between each power of two, to hopefully
-+     * cover things accurately enough.  (The alternative is
-+     * probably to just go for exact matching of sizes, and assume
-+     * that for things like composited window resize the tiled
-+     * width/height alignment and rounding of sizes to pages will
-+     * get us useful cache hit rates anyway)
-+     */
-+    add_bucket(bufmgr_gem, 4096);
-+    add_bucket(bufmgr_gem, 4096 * 2);
-+    add_bucket(bufmgr_gem, 4096 * 3);
-+
-+    /* Initialize the linked lists for BO reuse cache. */
-+    for (size = 4 * 4096; size <= cache_max_size; size *= 2) {
-+        add_bucket(bufmgr_gem, size);
-+
-+        add_bucket(bufmgr_gem, size + size * 1 / 4);
-+        add_bucket(bufmgr_gem, size + size * 2 / 4);
-+        add_bucket(bufmgr_gem, size + size * 3 / 4);
-+    }
-+}
-+
-+static void
-+mos_gem_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode)
- {
-     unsigned long size, cache_max_size = 64 * 1024 * 1024, unit_size;
-+    struct mos_bufmgr_gem *bufmgr_gem = (struct mos_bufmgr_gem *)bufmgr;
-+
-+    // Clean up the pre-allocated cache before re-allocating according
-+    // to alloc_mode
-+    mos_bufmgr_cleanup_cache(bufmgr_gem);
- 
-     /* OK, so power of two buckets was too wasteful of memory.
-      * Give 3 other sizes between each power of two, to hopefully
-@@ -5218,6 +5258,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-     bufmgr_gem->bufmgr.disable_object_capture = mos_gem_disable_object_capture;
-     bufmgr_gem->bufmgr.get_memory_info = mos_gem_get_memory_info;
-     bufmgr_gem->bufmgr.get_devid = mos_gem_get_devid;
-+    bufmgr_gem->bufmgr.realloc_cache = mos_gem_realloc_cache;
-     bufmgr_gem->bufmgr.set_context_param = mos_gem_set_context_param;
-     bufmgr_gem->bufmgr.set_context_param_parallel = mos_gem_set_context_param_parallel;
-     bufmgr_gem->bufmgr.set_context_param_load_balance = mos_gem_set_context_param_load_balance;
-@@ -5404,7 +5445,7 @@ mos_bufmgr_gem_init_i915(int fd, int batch_size)
-     bufmgr_gem->max_relocs = batch_size / sizeof(uint32_t) / 2 - 2;
- 
-     DRMINITLISTHEAD(&bufmgr_gem->named);
-    init_cache_buckets(bufmgr_gem,alloc_mode);
-+    init_cache_buckets(bufmgr_gem);
- 
-     DRMLISTADD(&bufmgr_gem->managers, &bufmgr_list);
- 
-diff --git a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
-index abe8ef96a..d0e02c267 100644
--- a/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
-+++ b/media_softlet/linux/common/os/i915/mos_bufmgr_api.c
-@@ -1204,6 +1204,25 @@ mos_bufmgr_get_devid(struct mos_bufmgr *bufmgr)
-     }
- }
- 
-+void
-+mos_bufmgr_realloc_cache(struct mos_bufmgr *bufmgr, uint8_t alloc_mode)
-+{
-+    if(!bufmgr)
-+    {
-+        MOS_OS_CRITICALMESSAGE("Input null ptr\n");
-+        return;
-+    }
-+
-+    if (bufmgr->realloc_cache)
-+    {
-+        return bufmgr->realloc_cache(bufmgr, alloc_mode);
-+    }
-+    else
-+    {
-+        MOS_OS_CRITICALMESSAGE("Unsupported\n");
-+    }
-+}
-+
- int
- mos_query_engines_count(struct mos_bufmgr *bufmgr,
-                       unsigned int *nengine)
-diff --git a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
-index c3b765a4c..1d7f7edb0 100644
--- a/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
-+++ b/media_softlet/linux/common/os/i915_production/mos_bufmgr_priv.h
-@@ -358,6 +358,7 @@ struct mos_bufmgr {
-     void (*disable_object_capture)(struct mos_bufmgr *bufmgr) = nullptr;
-     int (*get_memory_info)(struct mos_bufmgr *bufmgr, char *info, uint32_t length) = nullptr;
-     int (*get_devid)(struct mos_bufmgr *bufmgr) = nullptr;
-+    void (*realloc_cache)(struct mos_bufmgr *bufmgr, uint8_t alloc_mode) = nullptr;
-     int (*query_engines_count)(struct mos_bufmgr *bufmgr,
-                           unsigned int *nengine) = nullptr;
-     
-diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-index 543e262d1..87059f538 100644
--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
-+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-@@ -90,25 +90,7 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
- 
-         userSettingPtr = MosInterface::MosGetUserSettingInstance(osDriverContext);
- 
-        mode = BATCH_BUFFER_SIZE;
-        ReadUserSetting(
-            userSettingPtr,
-            value,
-            "INTEL MEDIA ALLOC MODE",
-            MediaUserSetting::Group::Device);
-
-        if (value)
-        {
-            mode |= (value & 0x000000ff);
-        }
-        value = 0;
-        /* no need to set batch buffer size after switch to softpin
-         * keep it, just for test during relocation to softpin transition
-         * now , it could be a debug method , but is actually useless
-         * so it is safe to reuse the lowest 8bit to convey addtional information
-         * more suitable solution is deleting it , or add additional parameter*/
-
-        m_bufmgr = mos_bufmgr_gem_init(m_fd, (int)mode, &m_deviceType);
-+        m_bufmgr = mos_bufmgr_gem_init(m_fd, BATCH_BUFFER_SIZE, &m_deviceType);
-         if (nullptr == m_bufmgr)
-         {
-             MOS_OS_ASSERTMESSAGE("Not able to allocate buffer manager, fd=0x%d", m_fd);
-@@ -151,6 +133,22 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
-             return eStatus;
-         }
- 
-+        if (m_platformInfo.eProductFamily == IGFX_METEORLAKE ||
-+            m_platformInfo.eProductFamily == IGFX_ARROWLAKE)
-+        {
-+            ReadUserSetting(
-+                userSettingPtr,
-+                value,
-+                "INTEL MEDIA ALLOC MODE",
-+                MediaUserSetting::Group::Device);
-+
-+            if (value)
-+            {
-+                mode = (value & 0x000000ff);
-+            }
-+            mos_bufmgr_realloc_cache(m_bufmgr, mode);
-+        }
-+
-         ReadUserSetting(
-             userSettingPtr,
-             value,
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch b/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch
deleted file mode 100644
index 8ee7ef14..00000000
--- a/recipes-multimedia/libva/files/0009-Skip-cache-bucket-realloc-for-default-mode-0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 18c32247cbc0e9fabff7a847add099496af9e53f Mon Sep 17 00:00:00 2001
-From: "Soon, Thean Siew" <thean.siew.soon@intel.com>
-Date: Mon, 8 Jan 2024 18:12:30 +0000
-Subject: [PATCH 09/12] Skip cache bucket realloc for default mode 0
-Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1754]
-Signed-off-by: Soon, Thean Siew <thean.siew.soon@intel.com>
---
- .../linux/common/os/mos_context_specific_next.cpp          | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/media_softlet/linux/common/os/mos_context_specific_next.cpp b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-index 87059f538..9dbd5da79 100644
--- a/media_softlet/linux/common/os/mos_context_specific_next.cpp
-+++ b/media_softlet/linux/common/os/mos_context_specific_next.cpp
-@@ -146,7 +146,12 @@ MOS_STATUS OsContextSpecificNext::Init(DDI_DEVICE_CONTEXT ddiDriverContext)
-             {
-                 mode = (value & 0x000000ff);
-             }
-            mos_bufmgr_realloc_cache(m_bufmgr, mode);
-+
-+            // Realloc cache only if it's not mode 0
-+            if (mode)
-+            {
-+                mos_bufmgr_realloc_cache(m_bufmgr, mode);
-+            }
-         }
- 
-         ReadUserSetting(
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch b/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch
deleted file mode 100644
index 0100df77..00000000
--- a/recipes-multimedia/libva/files/0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From 7291ab5206c5e172c6c94dcfbe4f1bc258f3b7a5 Mon Sep 17 00:00:00 2001
-From: WenshengZhang <wensheng.zhang@intel.com>
-Date: Wed, 10 Jan 2024 14:08:37 +0800
-Subject: [PATCH 10/12] Fix failed 4k video wall test case and color corruption
- of video composition
-Fix failed 4k video wall test case from 16CH video only show 1CH output and
-corruption observed on certain number of video composition when doing
-sample_multi_transcode.
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/38e14b1b97170b51586d00d1fa607e496b0c5825]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../common/vp/kdll/hal_kerneldll_next.h       |  1 +
- .../vp/hal/packet/vp_render_fc_kernel.cpp     |  7 ++
- .../common/vp/kdll/hal_kerneldll_next.c       | 70 +++++++++++--------
- .../linux/common/vp/ddi/ddi_vp_functions.cpp  | 20 ++----
- 4 files changed, 55 insertions(+), 43 deletions(-)
-diff --git a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
-index 6447999b7..8e2ab371e 100644
--- a/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
-+++ b/media_common/agnostic/common/vp/kdll/hal_kerneldll_next.h
-@@ -588,6 +588,7 @@ typedef struct tagKdll_FilterEntry
-     Kdll_Scalingratio      ScalingRatio;
-     Kdll_RenderMethod      RenderMethod;
-     Kdll_SetCSCCoeffMethod SetCSCCoeffMode;
-+    bool                   forceToTargetColorSpace;
- } Kdll_FilterEntry, *PKdll_FilterEntry;
- 
- // Structure that defines a compositing filter
-diff --git a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
-index 8e982f67e..f8308fed1 100644
--- a/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
-+++ b/media_softlet/agnostic/common/vp/hal/packet/vp_render_fc_kernel.cpp
-@@ -775,6 +775,13 @@ MOS_STATUS VpRenderFcKernel::BuildFilter(
- 
-     for (i = 0; (i < (int)compParams->sourceCount) && (iMaxFilterSize > 0); i++)
-     {
-+        if (i > 0)
-+        {
-+            if (!RECT1_CONTAINS_RECT2(compParams->source[0].surf->rcDst, compParams->source[i].surf->rcDst))
-+            {
-+                pFilter->forceToTargetColorSpace = true;
-+            }
-+        }
-         src = &compParams->source[i];
- 
-         //--------------------------------
-diff --git a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
-index d8f7d429a..151f3b039 100644
--- a/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
-+++ b/media_softlet/agnostic/common/vp/kdll/hal_kerneldll_next.c
-@@ -2378,6 +2378,7 @@ bool KernelDll_SetupCSC(
-     Kdll_CSC_Matrix  curr_matrix;
-     Kdll_CSC_Matrix *matrix   = pCSC->Matrix;    // Color Space conversion matrix
-     uint8_t *        matrixID = pCSC->MatrixID;  // CSC coefficient allocation table
-+    bool forceToTargetColorSpace = false;
- 
-     // Clear all CSC matrices
-     MOS_ZeroMemory(matrix, sizeof(pCSC->Matrix));
-@@ -2395,6 +2396,10 @@ bool KernelDll_SetupCSC(
-     //---------------------------------------------------------------//
-     for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
-     {
-+        if (pFilter->forceToTargetColorSpace)
-+        {
-+            forceToTargetColorSpace = true;
-+        }
-         // Disable Procamp for all layers except Main Video
-         // Disable Procamp if source is RGB
-         if (pFilter->layer != Layer_MainVideo ||
-@@ -2456,44 +2461,51 @@ bool KernelDll_SetupCSC(
-     //---------------------------------------------------------------//
-     if (sel_cspace == CSpace_Any)
-     {
-        int cs;
-        for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++)
-+        if (forceToTargetColorSpace)
-         {
-            // Skip color spaces not in use
-            cspace = (VPHAL_CSPACE)cs;
-            if (!cspace_in_use[cspace])
-            {
-                continue;
-            }
-
-            // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I)
-            cspace = KernelDll_TranslateCspace(cspace);
-
-            // Count # of CS conversions and matrices
-            csc_count = 0;
-            for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
-+            sel_cspace = out_cspace;
-+        }
-+        else
-+        {
-+            int cs;
-+            for (cs = (CSpace_Any + 1); cs < CSpace_Count; cs++)
-             {
-                // Ignore layers where the Color Space may be set in software (colorfill, palletized)
-                if (pFilter->cspace == CSpace_Any)
-+                // Skip color spaces not in use
-+                cspace = (VPHAL_CSPACE)cs;
-+                if (!cspace_in_use[cspace])
-                 {
-                     continue;
-                 }
- 
-                // Check if CSC/PA is required
-                if (KernelDll_TranslateCspace(pFilter->cspace) != cspace ||
-                    pFilter->procamp != DL_PROCAMP_DISABLED)
-+                // xvYCC and BT are treated as same for CSC considerations (BT.x to xvYCC.x matrix is I)
-+                cspace = KernelDll_TranslateCspace(cspace);
-+
-+                // Count # of CS conversions and matrices
-+                csc_count = 0;
-+                for (i = iFilterSize, pFilter = pSearchState->Filter; i > 0; i--, pFilter++)
-                 {
-                    csc_count++;
-+                    // Ignore layers where the Color Space may be set in software (colorfill, palletized)
-+                    if (pFilter->cspace == CSpace_Any)
-+                    {
-+                        continue;
-+                    }
-+
-+                    // Check if CSC/PA is required
-+                    if (KernelDll_TranslateCspace(pFilter->cspace) != cspace ||
-+                        pFilter->procamp != DL_PROCAMP_DISABLED)
-+                    {
-+                        csc_count++;
-+                    }
-                 }
-            }
- 
-            // Save best choice as requiring minimum number of CSC operations
-            if ((sel_csc_count < 0) ||                              // Initial value
-                (csc_count < sel_csc_count) ||                      // Minimum number of CSC operations
-                (csc_count == sel_csc_count && cs == main_cspace))  // Use main cspace as default if same CSC count
-            {
-                sel_cspace    = cspace;
-                sel_csc_count = csc_count;
-+                // Save best choice as requiring minimum number of CSC operations
-+                if ((sel_csc_count < 0) ||                              // Initial value
-+                    (csc_count < sel_csc_count) ||                      // Minimum number of CSC operations
-+                    (csc_count == sel_csc_count && cs == main_cspace))  // Use main cspace as default if same CSC count
-+                {
-+                    sel_cspace    = cspace;
-+                    sel_csc_count = csc_count;
-+                }
-             }
-         }
-     }
-diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
-index 40d0b3fad..e60a6c69c 100644
--- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
-+++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp
-@@ -2115,9 +2115,8 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill(
- {
-     DDI_VP_FUNC_ENTER;
-     DDI_VP_CHK_NULL(vpHalRenderParams, "nullptr vpHalRenderParams.", VA_STATUS_ERROR_INVALID_PARAMETER);
-    DDI_VP_CHK_NULL(vpHalRenderParams->pTarget[0],"nullptr pTarget[0].", VA_STATUS_ERROR_INVALID_PARAMETER);
- 
-    if ((outBackGroundcolor >> 24) != 0 || vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB)
-+    if ((outBackGroundcolor >> 24) != 0)
-     {
-         if (vpHalRenderParams->pColorFillParams == nullptr)
-         {
-@@ -2126,18 +2125,11 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill(
- 
-         DDI_VP_CHK_NULL(vpHalRenderParams->pColorFillParams, "nullptr pColorFillParams.", VA_STATUS_ERROR_UNKNOWN);
- 
-        if (vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB && (outBackGroundcolor >> 24) == 0)
-        {
-            // set color space for sRGB output
-            vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
-        }
-        else
-        {
-            // set background colorfill option
-            vpHalRenderParams->pColorFillParams->Color   = outBackGroundcolor;
-            vpHalRenderParams->pColorFillParams->bYCbCr  = false;
-            vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
-        }
-+        // set background colorfill option
-+        vpHalRenderParams->pColorFillParams->Color   = outBackGroundcolor;
-+        vpHalRenderParams->pColorFillParams->bYCbCr  = false;
-+        vpHalRenderParams->pColorFillParams->CSpace  = CSpace_sRGB;
-+
-     }
-     else
-     {
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch b/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch
deleted file mode 100644
index 2f4aec1e..00000000
--- a/recipes-multimedia/libva/files/0011-Disable-422H-format-output.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f8b4d982232d4c1330e1e5f5dcd7cd8ca94decba Mon Sep 17 00:00:00 2001
-From: WenshengZhang <wensheng.zhang@intel.com>
-Date: Thu, 25 Jan 2024 16:35:10 +0800
-Subject: [PATCH 11/12] Disable 422H format output
-Disable 422H format output.
-Upstream-Status: Backport [https://github.com/intel/media-driver/commit/eab411768e61a46e096793291f5f992eecf76cd8]
-Signed-off-by: Lim, Siew Hoon <siew.hoon.lim@intel.com>
---
- .../agnostic/common/vp/hal/feature_manager/policy.cpp       | 6 ++++++
- 1 file changed, 6 insertions(+)
-diff --git a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
-index 317cec25a..12f1124fa 100644
--- a/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
-+++ b/media_softlet/agnostic/common/vp/hal/feature_manager/policy.cpp
-@@ -1140,6 +1140,12 @@ MOS_STATUS Policy::GetScalingExecutionCaps(SwFilter *feature, bool isHdrEnabled)
-     bool isAlphaSettingSupportedByVebox =
-         IsAlphaSettingSupportedByVebox(scalingParams->formatInput, scalingParams->formatOutput, scalingParams->pCompAlpha);
- 
-+    if (scalingParams->formatOutput == Format_422H)
-+    {
-+        VP_PUBLIC_ASSERTMESSAGE("Scaling not support 422H format output.");
-+        return MOS_STATUS_UNIMPLEMENTED;
-+    }
-+
-     // Clean usedForNextPass flag.
-     if (scalingEngine->usedForNextPass)
-     {
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch b/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch
deleted file mode 100644
index 1be9139d..00000000
--- a/recipes-multimedia/libva/files/0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b93904533d3ee66c7919fa8e23d26b852a37a917 Mon Sep 17 00:00:00 2001
-From: Lim Siew Hoon <siew.hoon.lim@intel.com>
-Date: Tue, 30 Jan 2024 13:27:52 +0800
-Subject: [PATCH 12/12] [Decode] Fix AVC decode SFC 4K hang issue
-Updated VDSFC input width and height for AVC decode
-Upstream-Status: Submitted [https://github.com/intel-innersource/drivers.gpu.unified/pull/151401]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- .../hal/dec/avc/packet/decode_avc_downsampling_packet.cpp     | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
-index e75fd8137..9cc236bd7 100644
--- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
-+++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_downsampling_packet.cpp
-@@ -59,6 +59,10 @@ MOS_STATUS AvcDownSamplingPkt::InitSfcParams(VDBOX_SFC_PARAMS &sfcParams)
- 
-     AvcBasicFeature *avcBasicFeature = dynamic_cast<AvcBasicFeature*>(m_basicFeature);
-     DECODE_CHK_NULL(avcBasicFeature);
-+
-+    sfcParams.input.width  = avcBasicFeature->m_width;
-+    sfcParams.input.height = avcBasicFeature->m_height;
-+
-     CODEC_PICTURE curPic = avcBasicFeature->m_avcPicParams->CurrPic;
- 
-     if (avcBasicFeature->m_avcPicParams->seq_fields.mb_adaptive_frame_field_flag == true)
-- 
-2.40.1
diff --git a/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch b/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch
new file mode 100644
index 00000000..17b2d635
--- /dev/null
+++ b/recipes-multimedia/libva/files/8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch
@@ -0,0 +1,154 @@
+From 8aa866dc650e6b0e0b7425bafc7b1039232c377a Mon Sep 17 00:00:00 2001
+From: "Xu, Zhengguo" <zhengguo.xu@intel.com>
+Date: Tue, 16 Apr 2024 09:53:41 +0800
+Subject: [PATCH] [Decode] Correct condition check when dump avc mv buffer
+Fixes: #1791
+Signed-off-by: Xu, Zhengguo <zhengguo.xu@intel.com>
+Upstream-Status: Backport [https://github.com/intel/media-driver/commit/8aa866dc650e6b0e0b7425bafc7b1039232c377a]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ .../common/codec/hal/codechal_decode_avc.cpp  | 33 ++++++++-----------
+ .../decode_avc_picture_xe_m_base_packet.cpp   | 28 +++++++---------
+ .../avc/packet/decode_avc_picture_packet.cpp  | 30 +++++++----------
+ 3 files changed, 37 insertions(+), 54 deletions(-)
+diff --git a/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp b/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp
+index 3adf6994ce..4bac426802 100644
+--- a/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp
+++ b/media_driver/agnostic/common/codec/hal/codechal_decode_avc.cpp
+@@ -1619,28 +1619,23 @@ MOS_STATUS CodechalDecodeAvc::InitPicMhwParams(
+                 uint8_t picID = picMhwParams->AvcDirectmodeParams.bPicIdRemappingInUse ? i : refList[idx]->ucFrameId;
+                 uint8_t mvIdx = refList[idx]->ucDMVIdx[0];
+ 
+-                if (&picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[i] != nullptr)
+-                {
+-                    // dump Reference mvdata
+-                    std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(i);
+-                    CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+-                        &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[mvIdx],
+-                        CodechalDbgAttr::attrMvData,
+-                        mvBufDumpName.c_str(),
+-                        m_avcDmvBufferSize));
+-                }
+                // dump Reference mvdata
+                std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(i);
+                CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+                    &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[mvIdx],
+                    CodechalDbgAttr::attrMvData,
+                    mvBufDumpName.c_str(),
+                    m_avcDmvBufferSize));
+             }
+         }
+ 
+-        if (&picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx])
+-        {
+-            // dump Current mvdata
+-            CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+-            &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx],
+-                CodechalDbgAttr::attrMvData,
+-                "DEC_Cur_MV_",
+-                m_avcDmvBufferSize));
+-        });
+        // dump Current mvdata
+        CODECHAL_DECODE_CHK_STATUS_RETURN(m_debugInterface->DumpBuffer(
+        &picMhwParams->AvcDirectmodeParams.presAvcDmvBuffers[picMhwParams->AvcDirectmodeParams.ucAvcDmvIdx],
+            CodechalDbgAttr::attrMvData,
+            "DEC_Cur_MV_",
+            m_avcDmvBufferSize));
+        );
+ 
+     return eStatus;
+ }
+diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp
+index bd0611f6fa..035a7e6149 100644
+--- a/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp
+++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_M_base/codec/hal/dec/avc/packet/decode_avc_picture_xe_m_base_packet.cpp
+@@ -589,26 +589,20 @@ namespace decode{
+         {
+             if (m_avcBasicFeature->m_refFrames.m_avcPicIdx[n].bValid)
+             {
+-                if (&avcDirectmodeParams.presAvcDmvBuffers[n+1] != nullptr)
+-                {
+-                    std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+-                    DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-                        &avcDirectmodeParams.presAvcDmvBuffers[n+1],
+-                        CodechalDbgAttr::attrMvData,
+-                        mvBufDumpName.c_str(),
+-                        mvBufferSize));
+-                }
+                std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+                DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+                    &avcDirectmodeParams.presAvcDmvBuffers[n+1],
+                    CodechalDbgAttr::attrMvData,
+                    mvBufDumpName.c_str(),
+                    mvBufferSize));
+             }
+         }
+ 
+-        if (&avcDirectmodeParams.presAvcDmvBuffers[0] != nullptr)
+-        {
+-            DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-                &avcDirectmodeParams.presAvcDmvBuffers[0],
+-                CodechalDbgAttr::attrMvData,
+-                "DEC_Cur_MV_",
+-                mvBufferSize));
+-        }
+        DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+            &avcDirectmodeParams.presAvcDmvBuffers[0],
+            CodechalDbgAttr::attrMvData,
+            "DEC_Cur_MV_",
+            mvBufferSize));
+         return MOS_STATUS_SUCCESS;
+     }
+ 
+diff --git a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp
+index 88ed0bb832..8cdc05e585 100644
+--- a/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp
+++ b/media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_picture_packet.cpp
+@@ -646,26 +646,20 @@ MOS_STATUS AvcDecodePicPkt::DumpResources(uint32_t mvBufferSize) const
+                 CodechalDbgAttr::attrDecodeReferenceSurfaces,
+                 refSurfName.c_str()));
+ 
+-            if (&mvParam.presAvcDmvBuffers[n+1] != nullptr)
+-            {
+-                std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+-                DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-                    &mvParam.presAvcDmvBuffers[n+1],
+-                    CodechalDbgAttr::attrMvData,
+-                    mvBufDumpName.c_str(),
+-                    mvBufferSize));
+-            }
+            std::string mvBufDumpName = "_DEC_Ref_MV_" + std::to_string(n);
+            DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+                &mvParam.presAvcDmvBuffers[n+1],
+                CodechalDbgAttr::attrMvData,
+                mvBufDumpName.c_str(),
+                mvBufferSize));
+         }
+     }
+ 
+-    if (&mvParam.presAvcDmvBuffers[0] != nullptr)
+-    {
+-        DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+-            &mvParam.presAvcDmvBuffers[0],
+-            CodechalDbgAttr::attrMvData,
+-            "DEC_Cur_MV_",
+-            mvBufferSize));
+-    }
+    DECODE_CHK_STATUS(debugInterface->DumpBuffer(
+        &mvParam.presAvcDmvBuffers[0],
+        CodechalDbgAttr::attrMvData,
+        "DEC_Cur_MV_",
+        mvBufferSize));
+ 
+     return MOS_STATUS_SUCCESS;
+ }
+@@ -699,4 +693,4 @@ MOS_STATUS AvcDecodePicPkt::SetSurfaceMmcState() const
+     return MOS_STATUS_SUCCESS;
+ }
+ 
+-}  // namespace decode
+\ No newline at end of file
+}  // namespace decode
diff --git a/recipes-multimedia/libva/intel-media-driver_23.4.3.bb b/recipes-multimedia/libva/intel-media-driver_24.1.5.bb
index 6513d574..79f9887d 100644
--- a/recipes-multimedia/libva/intel-media-driver_23.4.3.bb
+++ b/recipes-multimedia/libva/intel-media-driver_24.1.5.bb
@@ -21,18 +21,10 @@ DEPENDS += "libva gmmlib"
 SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \
           file://0001-Disable-vp9-padding-on-mtl.patch \
           file://0002-Force-ARGB-surface-to-tile4-for-ACM.patch \
-           file://0004-Add-device-ID-for-ARL.patch \
+           file://8aa866dc650e6b0e0b7425bafc7b1039232c377a.patch \
-           file://0005-Add-XR24-support-to-DMABuf.patch \
-           file://0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch \
-           file://0007-Skip-report-keys.patch \
-           file://0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch \
-           file://0009-Skip-cache-bucket-realloc-for-default-mode-0.patch \
-           file://0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch \
-           file://0011-Disable-422H-format-output.patch \
-           file://0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch \
          "
-SRCREV = "a9f272496fc0f3e823cc4a814666ea27b443d902"
+SRCREV = "8068c2e119ba16c017e5a5f443fac5a55edbee65"
 S = "${WORKDIR}/git"
 COMPATIBLE_HOST:x86-x32 = "null"
diff --git a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch b/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch
deleted file mode 100644
index 8d1f3380..00000000
--- a/recipes-multimedia/onevpl/files/0001-ARLH-DID-open-source-6286.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a425927469b36e7bc597bff4fdc24d42a1168d1a Mon Sep 17 00:00:00 2001
-From: gfxVPLsdm <gfxvplsdm@intel.com>
-Date: Mon, 18 Dec 2023 09:58:35 +0800
-Subject: [PATCH] ARLH DID open source (#6286)
-Co-authored-by: huangli <li.h.huang@intel.com>
-Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/66f1b4d60a367eb1b0774e0b4369f906e0e632ae]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- _studio/shared/include/mfxstructures-int.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-diff --git a/_studio/shared/include/mfxstructures-int.h b/_studio/shared/include/mfxstructures-int.h
-index 363d9a63..8f16b0a8 100644
--- a/_studio/shared/include/mfxstructures-int.h
-+++ b/_studio/shared/include/mfxstructures-int.h
-@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2021 Intel Corporation
-+// Copyright (c) 2007-2023 Intel Corporation
- //
- // Permission is hereby granted, free of charge, to any person obtaining a copy
- // of this software and associated documentation files (the "Software"), to deal
-@@ -569,6 +569,11 @@ typedef struct {
-     /* ARL S */
-     { 0x7D67, MFX_HW_ARL, MFX_GT2 },
- 
-+    /* ARL H*/
-+    { 0x7D51, MFX_HW_ARL, MFX_GT2 },
-+    { 0x7DD1, MFX_HW_ARL, MFX_GT2 },
-+    { 0x7D41, MFX_HW_ARL, MFX_GT2 },
-+
- };
- 
- /*
-- 
-2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch b/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch
deleted file mode 100644
index 8e014c97..00000000
--- a/recipes-multimedia/onevpl/files/0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e118062518c95d8fb0080cc8276b123a90bd0eb9 Mon Sep 17 00:00:00 2001
-From: gfxVPLsdm <gfxvplsdm@intel.com>
-Date: Wed, 21 Feb 2024 17:11:52 +0800
-Subject: [PATCH] Fix SetBuffersYV12() V & U plane offsets calculation (#6475)
-Signed-off-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
-Co-authored-by: Hoe, Sheng Yang <sheng.yang.hoe@intel.com>
-Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/ce704ddfe11724767ba86c9425a3917dc3100d4a]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- _studio/shared/src/libmfx_core_vaapi.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/_studio/shared/src/libmfx_core_vaapi.cpp b/_studio/shared/src/libmfx_core_vaapi.cpp
-index 2cad86f8..fd5fc269 100644
--- a/_studio/shared/src/libmfx_core_vaapi.cpp
-+++ b/_studio/shared/src/libmfx_core_vaapi.cpp
-@@ -462,8 +462,8 @@ public:
-         }
-         else
-         {
-            eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[1] / 2);
-            eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[2] / 2);
-+            eb.offsets[1] = eb.offsets[0] + uint32_t(eb.height * eb.pitches[0]);
-+            eb.offsets[2] = eb.offsets[1] + uint32_t(eb.height * eb.pitches[1] / 2);
-         }
-         eb.num_planes = 3;
-         eb.data_size = eb.offsets[2] + (eb.height * eb.pitches[2] / 2);
-- 
-2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch b/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch
deleted file mode 100644
index e3854407..00000000
--- a/recipes-multimedia/onevpl/files/0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 40c0bc6d3dfe172dd25908df2c16de29c34fa4d4 Mon Sep 17 00:00:00 2001
-From: gfxVPLsdm <gfxvplsdm@intel.com>
-Date: Mon, 5 Feb 2024 17:14:07 +0800
-Subject: [PATCH] [JPEGe] Enable BGR4 JPEG Enc support (#6470)
-Co-authored-by: vcheah <vincent.beng.keat.cheah@intel.com>
-Upstream-Status: Backport [https://github.com/oneapi-src/oneVPL-intel-gpu/commit/e73763d05f8fdc348c356b58dcb83075b5e868f8]
-Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
---
- .../mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp  | 6 ++++--
- .../encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp    | 9 +++++----
- 2 files changed, 9 insertions(+), 6 deletions(-)
-diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
-index 141564b1..332f6372 100644
--- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
-+++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw.cpp
-@@ -212,7 +212,8 @@ mfxStatus MFXVideoENCODEMJPEG_HW::QueryImplsDescription(
-     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YV12;
-     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_YUY2;
-     ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_RGB4;
-    memCaps.NumColorFormats = 4;
-+    ah.PushBack(memCaps.ColorFormats) = MFX_FOURCC_BGR4;
-+    memCaps.NumColorFormats = 5;
- 
-     ah.PushBack(profileCaps.MemDesc);
-     profileCaps.MemDesc[1] = profileCaps.MemDesc[0];
-@@ -392,7 +393,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Query(VideoCORE * core, mfxVideoParam *in, mfx
-         if ((fourCC == 0 && chromaFormat == 0) ||
-             (fourCC == MFX_FOURCC_NV12 && (chromaFormat == MFX_CHROMAFORMAT_YUV420 || chromaFormat == MFX_CHROMAFORMAT_YUV400)) ||
-             (fourCC == MFX_FOURCC_YUY2 && chromaFormat == MFX_CHROMAFORMAT_YUV422H) ||
-            (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444))
-+            ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444))
-         {
-             out->mfx.FrameInfo.FourCC = in->mfx.FrameInfo.FourCC;
-             out->mfx.FrameInfo.ChromaFormat = in->mfx.FrameInfo.ChromaFormat;
-@@ -698,6 +699,7 @@ mfxStatus MFXVideoENCODEMJPEG_HW::Init(mfxVideoParam *par)
-             doubleBytesPerPx = 4;
-             break;
-         case MFX_FOURCC_RGB4:
-+        case MFX_FOURCC_BGR4:
-         default:
-             doubleBytesPerPx = 8;
-             break;
-diff --git a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
-index 3fc619d1..b1ab556e 100644
--- a/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
-+++ b/_studio/mfx_lib/encode_hw/mjpeg/src/mfx_mjpeg_encode_hw_utils.cpp
-@@ -108,6 +108,7 @@ mfxStatus MfxHwMJpegEncode::CheckJpegParam(VideoCORE *core, mfxVideoParam & par,
-             BytesPerPx = 2;
-             break;
-         case MFX_FOURCC_RGB4:
-+        case MFX_FOURCC_BGR4:
-         default:
-             BytesPerPx = 4;
-     }
-@@ -157,7 +158,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
- 
-     m_payload_base.length = 0;
-     m_payload_list.clear();
-    if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-+    if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)  && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-     {
-         m_app14_data.header    = 0xEEFF;//APP14
-         m_app14_data.lenH      = 0;
-@@ -287,7 +288,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
-         m_pps.num_components = 3;
-     else if (fourCC == MFX_FOURCC_NV12 && chromaFormat == MFX_CHROMAFORMAT_YUV400)
-         m_pps.num_components = 1;
-    else if (fourCC == MFX_FOURCC_RGB4 && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-+    else if ((fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4) && chromaFormat == MFX_CHROMAFORMAT_YUV444)
-         m_pps.num_components = 3;
-     else
-         MFX_RETURN(MFX_ERR_UNDEFINED_BEHAVIOR);
-@@ -341,7 +342,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
-     {
-         // No external tables - use Quality parameter
-         m_dqt_list.resize(0);
-        if (fourCC == MFX_FOURCC_RGB4)
-+        if (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4)
-         {
-             m_pps.quantiser_table_selector[0] = 0;
-             m_pps.quantiser_table_selector[1] = 0;
-@@ -393,7 +394,7 @@ mfxStatus ExecuteBuffers::Init(mfxVideoParam const *par, mfxEncodeCtrl const * c
-         {
-             m_dht_list.resize(0);
-         }
-        else if (hwCaps->MaxNumHuffTable == 1 || fourCC == MFX_FOURCC_RGB4)
-+        else if (hwCaps->MaxNumHuffTable == 1 || (fourCC == MFX_FOURCC_RGB4 || fourCC == MFX_FOURCC_BGR4))
-         {
-             m_dht_list.resize(1);
- 
-- 
-2.40.1
diff --git a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch b/recipes-multimedia/vpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
index 762a4902..f9a568a7 100644
--- a/recipes-multimedia/onevpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
+++ b/recipes-multimedia/vpl/files/0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch
@@ -1,4 +1,4 @@
-From 630c32194f53c70f4f654fb3d198790df253ba1f Mon Sep 17 00:00:00 2001
+From ff715f4c543ddabc5c90160d0ae5c5598e8e1289 Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Thu, 15 Jun 2023 13:43:32 +0200
 Subject: [PATCH] vpl.pc.in: dont pass pcfiledir to cflags
@@ -11,18 +11,15 @@ Upstream-Status: Inappropriate [oe specific]
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/libvpl/pkgconfig/vpl.pc.in b/libvpl/pkgconfig/vpl.pc.in
-index ab468a9..05c020e 100644
+index aa9b158..b4e85ff 100644
 --- a/libvpl/pkgconfig/vpl.pc.in
 +++ b/libvpl/pkgconfig/vpl.pc.in
-@@ -8,6 +8,6 @@ Description: oneAPI Video Processing Library
+@@ -7,6 +7,6 @@ Description: Accelerated video decode, encode, and frame processing capabilities
 Version: @API_VERSION_MAJOR@.@API_VERSION_MINOR@
- URL: https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onevpl.html
+ URL: https://github.com/intel/libvpl
 
 -Libs: -L${libdir} -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@
 +Libs: -L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -l@OUTPUT_NAME@ @VPL_PKGCONFIG_DEPENDENT_LIBS@
 Libs.private: @VPL_PKGCONFIG_PRIVATE_LIBS@
 -Cflags: -I${includedir} -I${includedir}/vpl
 +Cflags: -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/vpl
-- 
-2.40.1
diff --git a/recipes-multimedia/onevpl/onevpl_2023.4.0.bb b/recipes-multimedia/vpl/libvpl_2.10.2.bb
index 513c7f2c..04888e97 100644
--- a/recipes-multimedia/onevpl/onevpl_2023.4.0.bb
+++ b/recipes-multimedia/vpl/libvpl_2.10.2.bb
@@ -1,17 +1,17 @@
-SUMMARY = "oneAPI Video Processing Library"
+SUMMARY = "Intel Video Processing Library"
-DESCRIPTION = "The oneAPI Video Processing Library (oneVPL) provides \
+DESCRIPTION = "Intel Video Processing Library (VPL) provides \
 a single video processing API for encode, decode, and video processing \
 that works across a wide range of accelerators."
-HOMEPAGE = "https://github.com/oneapi-src/oneVPL"
+HOMEPAGE = "https://github.com/intel/libvpl"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \
-                    file://third-party-programs.txt;md5=0e35a23482445dd089b4eabe19103a06"
+                    file://third-party-programs.txt;md5=ddf05049184e74942f45b0ca4cc69b8a"
-SRC_URI = "git://github.com/oneapi-src/oneVPL.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/intel/libvpl.git;protocol=https;branch=main \
           file://0001-vpl.pc.in-dont-pass-pcfiledir-to-cflags.patch \
            "
-SRCREV = "2274efcd3672b43297ef774f332e1fed6781381c"
+SRCREV = "383b5caac6df614e76ade5a07c4f53be702e9176"
 S = "${WORKDIR}/git"
 inherit cmake
@@ -21,20 +21,23 @@ PACKAGECONFIG ??= "tools"
 PACKAGECONFIG[tools] = "-DBUILD_TOOLS=ON, -DBUILD_TOOLS=OFF, wayland wayland-native wayland-protocols"
 do_install:append() {
-        mkdir -p ${D}${datadir}/oneVPL/samples
+        mkdir -p ${D}${datadir}/VPL/samples
-        mv ${D}${bindir}/sample_* ${D}${datadir}/oneVPL/samples
+        mv ${D}${bindir}/sample_* ${D}${datadir}/VPL/samples
 }
 COMPATIBLE_HOST = '(x86_64).*-linux'
 PACKAGES =+ "${PN}-examples"
+RREPLACES:${PN} = "onevpl"
+RCONFLICTS:${PN} = "onevpl"
 FILES:${PN}-examples = "${datadir}/vpl \
                       "
 FILES_SOLIBSDEV = ""
 FILES:${PN}-dev += "${libdir}/libvpl.so"
-FILES:${PN} += " ${datadir}/oneVPL/samples  \
+FILES:${PN} += " ${datadir}/VPL/samples  \
                ${libdir}/vpl/libvpl_wayland.so \
                "
diff --git a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb b/recipes-multimedia/vpl/vpl-gpu-rt_24.1.5.bb
index 0b849bf1..40909a9c 100644
--- a/recipes-multimedia/onevpl/onevpl-intel-gpu_23.4.3.bb
+++ b/recipes-multimedia/vpl/vpl-gpu-rt_24.1.5.bb
@@ -2,8 +2,8 @@ SUMMARY = "Intel(R) oneVPL runtime for Intel GPU accelerated media processing"
 DESCRIPTION = "Intel(R) oneVPL runtime provides an runtime to access hardware-accelerated \
 video decode, encode and filtering on Intel® graphics."
-HOMEPAGE = "https://github.com/oneapi-src/oneVPL-intel-gpu"
+HOMEPAGE = "https://github.com/intel/vpl-gpu-rt"
-BUGTRACKER = "https://github.com/oneapi-src/oneVPL-intel-gpu/issues"
+BUGTRACKER = "https://github.com/intel/vpl-gpu-rt/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eb8cb45b9b57dbaa9fcc9adc4230202b"
@@ -14,16 +14,13 @@ PE = "1"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:x86-x32 = "null"
-DEPENDS += "libdrm libva intel-media-driver onevpl pkgconfig-native"
+DEPENDS += "libdrm libva intel-media-driver libvpl pkgconfig-native"
 RDEPENDS:${PN} += "intel-media-driver"
-SRC_URI = "git://github.com/oneapi-src/oneVPL-intel-gpu.git;protocol=https;nobranch=1;lfs=0 \
+SRC_URI = "git://github.com/intel/vpl-gpu-rt.git;protocol=https;nobranch=1;lfs=0 \
-           file://0001-ARLH-DID-open-source-6286.patch \
-           file://0001-JPEGe-Enable-BGR4-JPEG-Enc-support-6470.patch \
-           file://0001-Fix-SetBuffersYV12-V-U-plane-offsets-calculation-647.patch \
          "
-SRCREV = "852fa9f705ef44c004d014548601f3804a6de705"
+SRCREV = "088db9f5a8164525f00685c72f00a4baed97b90a"
 S = "${WORKDIR}/git"
 FILES:${PN} += " \
@@ -31,3 +28,6 @@ FILES:${PN} += " \
               "
 inherit cmake
+RREPLACES:${PN} = "onevpl-intel-gpu"
+RCONFLICTS:${PN} = "onevpl-intel-gpu"
diff --git a/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
index 702f794e..a1762a16 100644
--- a/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
+++ b/recipes-oneapi/setup-oneapi-env/setup-intel-oneapi-env_2023.0.0-25370.bb
@@ -7,9 +7,12 @@ LIC_FILES_CHKSUM = "file://${CUSTOM_LICENSES_PATH}/EULA;md5=7bfc91523de2e84e7131
 SRC_URI = "file://intel-oneapi-runtime.conf"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 do_install() {
    mkdir -p ${D}${sysconfdir}/ld.so.conf.d/
-    install -m 644 ${WORKDIR}/intel-oneapi-runtime.conf ${D}${sysconfdir}/ld.so.conf.d/
+    install -m 644 ${S}/intel-oneapi-runtime.conf ${D}${sysconfdir}/ld.so.conf.d/
 }
 pkg_postinst_ontarget:${PN}() {
diff --git a/recipes-selftest/images/files/incorrect.crt b/recipes-selftest/images/files/incorrect.crt
deleted file mode 100644
index 3a2411ab..00000000
--- a/recipes-selftest/images/files/incorrect.crt
+++ /dev/null
@@ -1,19 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDCTCCAfGgAwIBAgIJAIYXAHv3cQNjMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
-BAMMEFRlc3QgWW9jdG8gdGhpbmcwHhcNMTcwMTI1MjI1MjI3WhcNMTgwMTI1MjI1
-MjI3WjAbMRkwFwYDVQQDDBBUZXN0IFlvY3RvIHRoaW5nMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAukI2ioMeL8qaXxMtryonAT51w+Zre0wB8bDBPuXD
-SwDVXNWfiKKTfCVEkLEUnsUEd7jiKswCT5orTwCD7aQK0mTrkAWEi8hEI3MkNoeh
-T51gkuTfv7A/HgPkhhlU4UQqipI6XoLf7o7PUV33ZfB43//iKY2kLBdsFvs4ALWE
-31hLOkCFb+nqMnfZxq7DgvBwIdxJdLQvaskpDMfkna+zE3QWqkH5v55atW8Bunwk
-/6q5kqNhyrjZb4i0BqJ5AHFUEQzlDcjpyFVUtR14r0IxjBFMHZXrx4uLe7KvGf/4
-GqpqeFOPqxMsfC5ILJJ7nvwFViqftGgtWg/12bKMTB5saQIDAQABo1AwTjAdBgNV
-HQ4EFgQURA8KbgpiGfS2+7MT0H5AvpxeYLowHwYDVR0jBBgwFoAURA8KbgpiGfS2
-+7MT0H5AvpxeYLowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAK9n+
-9T+hlM2kEpsUgtyihEJbGHzbw+Pj11b0ICntCVuPKewtBMveYp8lejrQwMFNGRMt
-ZQe1LFb9HcLeM3MLUz9Lm4BJIjkey3Jfq1AskROYk/bJnFIJIx6P3U9gBa20P46X
-LH3g6yub1HR7KZC9nfBsak3FPoJR/SYTJs0HsMeL4878+2IbETA4BL0kbKW48FFW
-jF4f6don0eiaF8b4KkfbWKrCaEm+LMxbyBEQ6fIb1cmGY8A9A5houjmgi6YWSkoi
-SLpOC9TZ2R51fO9rRsv7XwLK0V9o9YaEYPBg6V/TeJl5nxAZBeVTKVTQbBGZY+l2
-nzN0pKsl7RXLf3SRYA==
-----END CERTIFICATE-----
diff --git a/recipes-selftest/images/files/incorrect.key b/recipes-selftest/images/files/incorrect.key
deleted file mode 100644
index d05475b6..00000000
--- a/recipes-selftest/images/files/incorrect.key
+++ /dev/null
@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAukI2ioMeL8qaXxMtryonAT51w+Zre0wB8bDBPuXDSwDVXNWf
-iKKTfCVEkLEUnsUEd7jiKswCT5orTwCD7aQK0mTrkAWEi8hEI3MkNoehT51gkuTf
-v7A/HgPkhhlU4UQqipI6XoLf7o7PUV33ZfB43//iKY2kLBdsFvs4ALWE31hLOkCF
-b+nqMnfZxq7DgvBwIdxJdLQvaskpDMfkna+zE3QWqkH5v55atW8Bunwk/6q5kqNh
-yrjZb4i0BqJ5AHFUEQzlDcjpyFVUtR14r0IxjBFMHZXrx4uLe7KvGf/4GqpqeFOP
-qxMsfC5ILJJ7nvwFViqftGgtWg/12bKMTB5saQIDAQABAoIBAQCEtAox86s9N6d2
-164z3998Zmj3UyL+7K9x6JI2YvMabBSYGOeaLOLRj6fjQxdC63H8brBM958p4di7
-Z82XMco4Dok6yoOeJ+hMLYv+gfGvTJxy7DhyVXsSwok99axg9vUsV3TYw3wSdpNF
-EKLkcUldpu0W2ADBHUr4sLI85xctHH3Kt0sNDzhgADFa5rDYACXTKHtFOhEqBIwN
-FmbuRQirnErUkI3Pczgl2Xy1MlaozH9CB+bLAb5q2FYu4DKgjl4UorC+w2HV41KH
-XoL7L36XXqLRHBfEAwOWb8yro+TK8T7gW7aagTI1wgsbbQkjQmOHxclmJACdMOiJ
-DjPeR0GBAoGBAO7i2eaEoKa9QlKokN+93uOJD/F6DBi6jF0vGOqWlF8AVTj3kGL3
-X8fY/avrSlg7hKZWdei+Q5PyZViKxqmHjq781ZisKck52Tqz4s7ylqRXSgStinZr
-UqrkShCqZ3g1W91gIeVPQz0/b+gBskoHzQ5WQHfV5v9S1PaxjzcYtCrRAoGBAMea
-LcA2jjuEjqxa5v5fh8ygcHasJMRKJxW1OCKiQ94DjjzPsdVqZ1sJZChLW/N3nxe7
-wHlNJmsGbJ2w1zD5+qkkPjLq5Q4B5KAd62NNrWaEHFdEc/PPkn4xP7Zkfuu5K+m2
-7z/MF4ibvVh9PvD3HY8FWKEtkqB4rfD8AoUOVd4ZAoGAXxXAsfa8k2Hl0kzyTXyg
-CWV3CSERS46FbFngyw9gw2e4hFJWEG5ym3ONlS60iuY16JelmxyQfYUQPewPI0+n
-xZMx2fE9OLFj+++6KbF5sLRl6/K/mF8jqo3vxS5uvPRQOo+XLlUcaHalrm1ub/Um
-87v1MT3dEmgACKmoXb/hhuECgYAZluiapePiOYJZEmZe4jx0vXTtofAswhz0qYEC
-3663vdj0buQrqjKJ91BB4jdtpT5eOpHYe02blv1B0jQkcUfze1QGDxtCineXF37g
-Aktiwzkm7v22mjv7tbCnX4buDZVVp0BQ+4dg2iaSO6xgFC5T8amFMGSF8jLKnGRu
-ToIvsQKBgADBTse2vnI85NRsYq48ztQuIU2zlGXIAcoPSvGb8Vhty/joc0jWcI5P
-raGXBARbuVlcEapK3mDRfO0CQjDaTPK4EYYJwGp8k33Hkkcbgs4kfm308jRsclMr
-YeMwQsYyOv45x4iPCwrqZEhpPDvACBi7DB6QvZ0++vJbobTt1jyi
-----END RSA PRIVATE KEY-----
diff --git a/recipes-selftest/images/files/refkit-db.crt b/recipes-selftest/images/files/refkit-db.crt
deleted file mode 100644
index 22ad6a89..00000000
--- a/recipes-selftest/images/files/refkit-db.crt
+++ /dev/null
@@ -1,18 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIC+zCCAeOgAwIBAgIJANT2SMJoGZGsMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
-BAMMCXJlZmtpdC1kYjAeFw0xNzA0MjAxMjA2MzJaFw0xODA0MjAxMjA2MzJaMBQx
-EjAQBgNVBAMMCXJlZmtpdC1kYjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALQcIqYiAVfN8U+vcuPZAYBQVe8CXuuZNct/Knn/tT7sXZIGMCDnla2khC4/
-+tdG3Umo6ON5SfaPCx3+Y6jRY6PWDU5sZlzWZibRJpjUT3bJZUhYEwgxvOVHJWWV
-OYlfAvHFBhdYygn99h7Fl9qjThpIvs+WJwRLt21ntlAYBHNR0mot3zur8i2V16i4
-qDChq4uSK2A+OuWGQHHBPy0ukOfW7MzCC3mDcW32o6lMzUaB3O/sUb6BKvF4c0Hb
-VM58zqLjkE9FGvk9iPwO7dNpIkz6CmnRSMCqqTqzjxA6dqgMej3Yec4clmL0Bu5H
-6OBpka7qNM/aqLQ5XvN60IhIR2kCAwEAAaNQME4wHQYDVR0OBBYEFGhgESWFFHgb
-Gp9GEuYh5O/7O6rdMB8GA1UdIwQYMBaAFGhgESWFFHgbGp9GEuYh5O/7O6rdMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI/ShHxDR8pr/YeD0O910yBS
-cxiqMnH7pfTJEaNoTbed5tlGJNzHwjv5sJj87jRuEJs9RG4zCRG4KdYtBs9nj5aF
-nWNyv2RfDePJYxlx1H1MnHdG2iCXbbzdwh/zQDge58xVBXK6JE+zipMMMGDan281
-9vuwH7MA3cSmvOI3waPv2aGG+eukpUU4/06HSkHPbml+l74tIryNoBohj0tykAFc
-uqWcLdclJPz/XFgURjAJfFVkgwu5388l7uz3y9vRW5OTyIoQRriwNRxsDY8Dao8b
-NmjzU4k2WyGA3uOSUpSXnUmJfT7eKVG6Efe6Afer6sGnLqNNZf1AcfHiP2woy9M=
-----END CERTIFICATE-----
diff --git a/recipes-selftest/images/files/refkit-db.key b/recipes-selftest/images/files/refkit-db.key
deleted file mode 100644
index 4b54587e..00000000
--- a/recipes-selftest/images/files/refkit-db.key
+++ /dev/null
@@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC0HCKmIgFXzfFP
-r3Lj2QGAUFXvAl7rmTXLfyp5/7U+7F2SBjAg55WtpIQuP/rXRt1JqOjjeUn2jwsd
-/mOo0WOj1g1ObGZc1mYm0SaY1E92yWVIWBMIMbzlRyVllTmJXwLxxQYXWMoJ/fYe
-xZfao04aSL7PlicES7dtZ7ZQGARzUdJqLd87q/ItldeouKgwoauLkitgPjrlhkBx
-wT8tLpDn1uzMwgt5g3Ft9qOpTM1Ggdzv7FG+gSrxeHNB21TOfM6i45BPRRr5PYj8
-Du3TaSJM+gpp0UjAqqk6s48QOnaoDHo92HnOHJZi9AbuR+jgaZGu6jTP2qi0OV7z
-etCISEdpAgMBAAECggEAbtXplKbUgL4hQ9JKN2Cxhc7qMv0YgI92BVaqQw1S8ffu
-1Q+tynH5MDRPi06gBJ59SvkA6AsZsvrv8nM7zQWd9ZKh+aLHk1X04upOgDoW9JiX
-FV/txlslTUrs/ohIMfsgCrweNXvUSTXZobIi8s8QHyipE4HpXMFjjZYHIV7GTlgA
-PRgGu3NygbWfR8hcx5JtzVz/jka7FFFSbk/pMr0TeJHXP55VfqWLeeSBQmWwooj2
-QcRfqMXgLKgu6uEggaP5HMcfTuWgWNhbke/596CgsUtQ5Gg64Q6v7cKcPy0/lgn1
-PnvfT9uhgEFDLNFkSBxV3ImrNYo73Nqmbp3w5tK9SQKBgQDs/HW7pNnB0LD51qok
-pkX0SBvyKxDT1QuU4z0FY9GT7OKOg8Xa0ZGyErt+ZbyFiyUGF5Axc3rJ3DyGslgu
-5O+AqcpCQOlOyovGQ6ST9x/gEeVcRnZn1MV4vMxwaOSXtY7u0IGyaDlFn1QWHWCN
-imv8OR6YuhivwBIXGzJ16oEqDwKBgQDCj3ls7tlPrLvUQIh8gfjCoInU8fRAqtAe
-Ab/OximLsKQPKLDma6xd+X2Fk8Dowdb88GNT99x3VZjHqVJM9URDkiOGKAXA/rBp
-jAXhnQwahT8YCzOUHqDYNMMQrXHvbiHqLodGrrO2WjYNmH69prQAk8WYAIwl+hdx
-BS70LGLPBwKBgQDU9RinAkBcFjiyieBjBreeCJ50Q5bfhHbf2EOhcE2IbDo6bteB
-Bwmxx3uM3cdHCf6/NrVweqFAfBQ3xlPP8BH4wJrsZoBBOWnZRDfEbzHJnMtK3FbS
-fzTkhmQAL4Ibgh9rIxspQtcUZVSees+k4VqgUIPaIoDEjgizktEJfS2MqQKBgQDA
-rOFtVaRz2PYyHq6LzxMRe3bEIdDn8cEk1kqjdW9TXV07feqiZmNOtXLvRAG4/63u
-1Akp8L6ul2Az6qUMfaBa4nC3vQ7lr9P40qhIZATGhsqS/xTXTPWw55999qZsnL6N
-cgKZpw1mOzRohmqNWnfMUotOGsywF1n7nUyAlyxLJQKBgElTaNTFYF3MbGfhl1He
-fnDXlf8OCOK1i5oIzMLqverb2UN/qp6p0b3SAtcw5cUXcaPlajHrfYgacF/0Qyua
-Cerey9GLEdJ7saDWhz0GyJ8yyEXy8CVs0svVaLPWI0s2B7/obzP9+gTb/WE9qZqu
-bNoVEpJ/wZhk+IL4+KPmqphu
-----END PRIVATE KEY-----
diff --git a/recipes-selftest/images/secureboot-selftest-image-signed.bb b/recipes-selftest/images/secureboot-selftest-image-signed.bb
deleted file mode 100644
index 3ce11f32..00000000
--- a/recipes-selftest/images/secureboot-selftest-image-signed.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require secureboot-selftest-image-unsigned.bb
-IMAGE_FEATURES += "secureboot"
-SECURE_BOOT_SIGNING_KEY ?= "${THISDIR}/files/refkit-db.key"
-SECURE_BOOT_SIGNING_CERT ?= "${THISDIR}/files/refkit-db.crt"
diff --git a/recipes-selftest/images/secureboot-selftest-image-unsigned.bb b/recipes-selftest/images/secureboot-selftest-image-unsigned.bb
deleted file mode 100644
index d0fa6405..00000000
--- a/recipes-selftest/images/secureboot-selftest-image-unsigned.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require recipes-core/images/core-image-minimal.bb
-DEPENDS:remove = "grub-efi"
-inherit uefi-comboapp
-WKS_FILE = "generic-bootdisk.wks.in"
-do_uefiapp_deploy:append() {
-    for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.boot*.efi; do
-        target=`basename $i`
-        target=`echo $target | sed -e 's/${IMAGE_LINK_NAME}.//'`
-        cat > ${IMAGE_ROOTFS}/boot/startup.nsh << EOF
-$target
-reset
-EOF
-    break
-    done
-}
diff --git a/recipes-support/libipt/libipt_2.1.1.bb b/recipes-support/libipt/libipt_2.1.1.bb
index 205967c1..c4b5ecaa 100644
--- a/recipes-support/libipt/libipt_2.1.1.bb
+++ b/recipes-support/libipt/libipt_2.1.1.bb
@@ -27,7 +27,7 @@ do_install:append() {
    install -d ${D}${bindir}/libipt/tests
    cp -r ${B}/bin/* ${D}${bindir}/libipt/
-    cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests
+    cp -r ${S}/test/src/* ${D}${bindir}/libipt/tests
 }
 FILES:${PN}-test = "${bindir}"
diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb
deleted file mode 100644
index 5a9f5b4d..00000000
--- a/recipes-support/sbsigntool/sbsigntool-native_git.bb
+++ /dev/null
@@ -1,83 +0,0 @@
-DESCRIPTION = "Utility for signing and verifying files for UEFI Secure Boot"
-LICENSE = "GPL-3.0-only & LGPL-2.1-only & LGPL-3.0-only & MIT"
-# sbsigntool statically links to libccan.a which is built with modules
-# passed to "create-ccan-tree" (and their dependencies). Therefore,
-# we also keep track of all the ccan module licenses.
-LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=9eef91148a9b14ec7f9df333daebc746 \
-                    file://COPYING;md5=a7710ac18adec371b84a9594ed04fd20 \
-                    file://lib/ccan.git/ccan/endian/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/htable/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/list/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/read_write_all/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/talloc/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/typesafe_cb/LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://lib/ccan.git/ccan/failtest/LICENSE;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                    file://lib/ccan.git/ccan/tlist/LICENSE;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                    file://lib/ccan.git/ccan/time/LICENSE;md5=838c366f69b72c5df05c96dff79b35f2 \
-"
-# The original upstream is git://kernel.ubuntu.com/jk/sbsigntool but it has
-# not been maintained and many patches have been backported in this repo.
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git;protocol=https;name=sbsigntools;branch=master \
-           git://github.com/rustyrussell/ccan.git;protocol=https;destsuffix=git/lib/ccan.git;name=ccan;branch=master \
-           file://0001-configure-Fixup-build-dependencies-for-cross-compili.patch \
-           "
-SRCREV_sbsigntools  ?= "9cfca9fe7aa7a8e29b92fe33ce8433e212c9a8ba"
-SRCREV_ccan         ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5"
-SRCREV_FORMAT       =  "sbsigntools_ccan"
-DEPENDS = "binutils-native gnu-efi-native help2man-native openssl-native util-linux-native"
-PV = "0.9.5"
-S = "${WORKDIR}/git"
-inherit autotools pkgconfig
-inherit native
-do_configure:prepend() {
-        cd ${S}
-        sed -i s#RECIPE_SYSROOT#${RECIPE_SYSROOT_NATIVE}#g configure.ac
-        if [ ! -e lib/ccan ]; then
-                # Use empty SCOREDIR because 'make scores' is not run.
-                # The default setting depends on (non-whitelisted) host tools.
-                sed -i -e 's#^\(SCOREDIR=\).*#\1#' lib/ccan.git/Makefile
-                lib/ccan.git/tools/create-ccan-tree \
-                --build-type=automake lib/ccan \
-                talloc read_write_all build_assert array_size endian
-        fi
-        # Create generatable docs from git
-        (
-         echo "Authors of sbsigntool:"
-         echo
-         git log --format='%an' | sort -u | sed 's,^,\t,'
-        ) > AUTHORS
-        # Generate simple ChangeLog
-        git log --date=short --format='%ad %t %an <%ae>%n%n  * %s%n' > ChangeLog
-        cd ${B}
-}
-def efi_arch(d):
-    import re
-    harch = d.getVar("HOST_ARCH")
-    if re.match("i[3456789]86", harch):
-        return "ia32"
-    return harch
-EXTRA_OEMAKE = "\
-    INCLUDES+='-I${S}/lib/ccan.git/ \
-              -I${STAGING_INCDIR_NATIVE}/efi \
-              -I${STAGING_INCDIR_NATIVE} \
-              -I${STAGING_INCDIR_NATIVE}/efi/${@efi_arch(d)}' \
-    "
-CFLAGS:append = " -Wno-error"
diff --git a/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch b/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch
deleted file mode 100644
index ea7bee29..00000000
--- a/recipes-support/sbsigntool/sbsigntool/0001-configure-Fixup-build-dependencies-for-cross-compili.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c3533b8da1e1425801d2fc0bcd231e13d593f16b Mon Sep 17 00:00:00 2001
-From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
-Date: Tue, 19 Feb 2019 20:07:45 +0800
-Subject: [PATCH] configure: Fixup build dependencies for cross-compiling
-When cross-compiling, custom header files and libraries need to be
-specified. sbsign assumes that all the dependencies are located
-under /usr/include and /usr/lib.
-Prepend these paths with a placeholder that can be replaced with the
-actual paths once they are resolved.
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
-Taken from :
-https://github.com/intel/luv-yocto/tree/master/meta-luv/recipes-devtools/sbsigntool/sbsigntool
-Corrected typo error and ported to version 0.9.2
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- configure.ac | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 1459e91..3e34c8d 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -70,7 +70,10 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "
- ##
- # no consistent view of where gnu-efi should dump the efi stuff, so find it
- ##
-for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
-+for path in RECIPE_SYSROOT/lib RECIPE_SYSROOT/lib64 RECIPE_SYSROOT/usr/lib \
-+            RECIPE_SYSROOT/usr/lib64 RECIPE_SYSROOT/usr/lib32 \
-+            RECIPE_SYSROOT/lib/efi RECIPE_SYSROOT/lib64/efi \
-+            RECIPE_SYSROOT/usr/lib/efi RECIPE_SYSROOT/usr/lib64/efi; do
-     if test -e $path/crt0-efi-$EFI_ARCH.o; then
-        CRTPATH=$path
-     fi
-@@ -79,7 +82,7 @@ if test -z "$CRTPATH"; then
-    AC_MSG_ERROR([cannot find the gnu-efi crt path])
- fi
- 
-EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
-+EFI_CPPFLAGS="-IRECIPE_SYSROOT/usr/include/efi -IRECIPE_SYSROOT/usr/include/efi/$EFI_ARCH \
-  -DEFI_FUNCTION_WRAPPER"
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
-- 
-2.7.4