64 files changed, 1254 insertions, 1672 deletions
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.7.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
index ad3c1638..2fa3f627 100644
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.7.1.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb
@@ -3,7 +3,7 @@ SUMMARY  = "Deep Neural Network Library"
 DESCRIPTION = "This software is a user mode library that accelerates\
 deep-learning applications and frameworks on Intel architecture."
 LICENSE  = "Apache-2.0 & BSD-3-Clause & BSL-1.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
                    file://tests/gtests/gtest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
                    file://src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
                    file://src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
@@ -12,9 +12,11 @@ SECTION = "lib"
 inherit pkgconfig cmake ptest
+DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 S = "${WORKDIR}/git"
-SRCREV = "a96c94f39773df35760d037d1ebe580dcf79c137"
+SRCREV = "f5ff0a6de16c130053bec1a1aec3a9b826c66f78"
-SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=rls-v2.7;protocol=https \
+SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \
           file://run-ptest \
           "
@@ -32,10 +34,11 @@ EXTRA_OECMAKE += " \
                   -DDNNL_CPU_RUNTIME=OMP \
                   -DDNNL_ARCH_OPT_FLAGS="" \
                   -DCMAKE_SKIP_RPATH=ON \
+                   -DONEDNN_BUILD_GRAPH=OFF \
                   "
 PACKAGECONFIG ??= "gpu"
-PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime"
+PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers virtual/opencl-icd, intel-compute-runtime"
 do_install:append () {
    install -d ${D}${bindir}/mkl-dnn/tests/benchdnn/inputs
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch
deleted file mode 100644
index 4e25420c..00000000
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b9bc0df996d1e65fd70d5eb2d40866693f23bb67 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Thu, 24 Jun 2021 17:53:27 +0800
-Subject: [PATCH] CMakeLists.txt: link with libclang-cpp library instead
-Upstream-Status: Inappropriate
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef88317e..7507d6a5 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -281,7 +281,7 @@ if (WASM_ENABLED)
-     list(APPEND ISPC_TARGETS wasm-i32x4)
- endif()
- 
-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
-+set(CLANG_LIBRARY_LIST clang-cpp)
- set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
- 
- if (X86_ENABLED)
-- 
-2.17.1
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/6a1b2ffae0cc12467838bc671e3b089924de90a6.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/6a1b2ffae0cc12467838bc671e3b089924de90a6.patch
deleted file mode 100644
index 6aac0c79..00000000
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/6a1b2ffae0cc12467838bc671e3b089924de90a6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6a1b2ffae0cc12467838bc671e3b089924de90a6 Mon Sep 17 00:00:00 2001
-From: Dmitry Babokin <dmitry.y.babokin@intel.com>
-Date: Thu, 5 May 2022 16:34:34 -0700
-Subject: [PATCH] Bump ISPC version v1.19.0dev
-Upstream-Status: Backport
-Include only the LLVM specific bits and not the ispc version bump.
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
-diff --git a/src/ispc_version.h b/src/ispc_version.h
-index 0e28dfcfa..2b9d9b0cc 100644
--- a/src/ispc_version.h
-+++ b/src/ispc_version.h
-@@ -51,7 +51,7 @@
- #define ISPC_LLVM_15_0 150000
- 
- #define OLDEST_SUPPORTED_LLVM ISPC_LLVM_10_0
-#define LATEST_SUPPORTED_LLVM ISPC_LLVM_14_0
-+#define LATEST_SUPPORTED_LLVM ISPC_LLVM_15_0
- 
- #ifdef __ispc__xstr
- #undef __ispc__xstr
-@@ -63,7 +63,7 @@
-     __ispc__xstr(LLVM_VERSION_MAJOR) "." __ispc__xstr(LLVM_VERSION_MINOR) "." __ispc__xstr(LLVM_VERSION_PATCH)
- 
- #if ISPC_LLVM_VERSION < OLDEST_SUPPORTED_LLVM || ISPC_LLVM_VERSION > LATEST_SUPPORTED_LLVM
-#error "Only LLVM 11.0 - 14.0 are supported"
-+#error "Only LLVM 11.0 - 14.0 and 15.0 development branch are supported"
- #endif
- 
- #define ISPC_VERSION_STRING                                                                                            \
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch b/dynamic-layers/clang-layer/recipes-core/ispc/ispc/ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch
deleted file mode 100644
index a5ab8c19..00000000
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda Mon Sep 17 00:00:00 2001
-From: Arina Neshlyaeva <arina.neshlyaeva@intel.com>
-Date: Tue, 23 Aug 2022 15:21:50 -0700
-Subject: [PATCH] Adjust opt passes for LLVM 15
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- src/opt.cpp | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-diff --git a/src/opt.cpp b/src/opt.cpp
-index 910821e26..86219f384 100644
--- a/src/opt.cpp
-+++ b/src/opt.cpp
-@@ -84,6 +84,9 @@
- #include <llvm/Transforms/Scalar.h>
- #include <llvm/Transforms/Scalar/GVN.h>
- #include <llvm/Transforms/Scalar/InstSimplifyPass.h>
-+#if ISPC_LLVM_VERSION >= ISPC_LLVM_15_0
-+#include <llvm/Transforms/Scalar/SimpleLoopUnswitch.h>
-+#endif
- #include <llvm/Transforms/Utils.h>
- #include <llvm/Transforms/Utils/BasicBlockUtils.h>
- 
-@@ -647,7 +650,11 @@ void ispc::Optimize(llvm::Module *module, int optLevel) {
-         optPM.add(llvm::createCFGSimplificationPass());
- #endif
- 
-+#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0
-+        // Starting LLVM 15.0 this pass is supported with new pass manager only (217e857)
-+        // TODO: switch ISPC to new pass manager: https://github.com/ispc/ispc/issues/2359
-         optPM.add(llvm::createArgumentPromotionPass());
-+#endif
- 
-         optPM.add(llvm::createAggressiveDCEPass());
-         optPM.add(llvm::createInstructionCombiningPass(), 241);
-@@ -722,7 +729,11 @@ void ispc::Optimize(llvm::Module *module, int optLevel) {
-         optPM.add(CreateInstructionSimplifyPass());
- 
-         optPM.add(llvm::createFunctionInliningPass());
-+#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0
-+        // Starting LLVM 15.0 this pass is supported with new pass manager only (217e857)
-+        // TODO: switch ISPC to new pass manager: https://github.com/ispc/ispc/issues/2359
-         optPM.add(llvm::createArgumentPromotionPass());
-+#endif
- 
-         optPM.add(llvm::createSROAPass());
- 
-@@ -736,7 +747,13 @@ void ispc::Optimize(llvm::Module *module, int optLevel) {
-         optPM.add(llvm::createReassociatePass());
-         optPM.add(llvm::createLoopRotatePass());
-         optPM.add(llvm::createLICMPass());
-+        // Loop unswitch pass was removed in LLVM 15.0 (fb4113).
-+        // Recommended replacement: createSimpleLoopUnswitchLegacyPass
-+#if ISPC_LLVM_VERSION < ISPC_LLVM_15_0
-         optPM.add(llvm::createLoopUnswitchPass(false));
-+#else
-+        optPM.add(llvm::createSimpleLoopUnswitchLegacyPass(false));
-+#endif
-         optPM.add(llvm::createInstructionCombiningPass());
-         optPM.add(CreateInstructionSimplifyPass());
-         optPM.add(llvm::createIndVarSimplifyPass());
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
index 4646856d..265fcfa2 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch
@@ -1,4 +1,4 @@
-From 40e9344d37d62158e6c9f72919f0595ef5fde61a Mon Sep 17 00:00:00 2001
+From a6361d635e5f3046853883f3ac06fb175116933c Mon Sep 17 00:00:00 2001
 From: Dongwon Kim <dongwon.kim@intel.com>
 Date: Sat, 21 Aug 2021 16:09:39 -0700
 Subject: [PATCH] Build not able to locate cpp_generation_tool.
@@ -7,28 +7,27 @@ Upstream-Status: Inappropriate [oe specific]
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
 ---
- shared/source/built_ins/kernels/CMakeLists.txt | 8 ++++----
+ shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++-----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt
-index 769e2a100..eef25747e 100644
+index ed85a37c52..f7c9e79137 100644
 --- a/shared/source/built_ins/kernels/CMakeLists.txt
 +++ b/shared/source/built_ins/kernels/CMakeLists.txt
-@@ -94,9 +94,9 @@ function(compile_builtin core_type platform_type builtin bits builtin_options mo
+@@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode
       )
       add_custom_command(
                          OUTPUT ${OUTPUT_FILE_CPP}
-                         COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID}
+-                         COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME}
-+                         COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.gen --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --platform ${family_name_with_type} --revision_id ${REVISION_ID}
+                         COMMAND cpp_generate_tool --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME}
                          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 -                         DEPENDS ${OUTPUT_FILES_BINARIES} $<TARGET_FILE:cpp_generate_tool>
 +                         DEPENDS ${OUTPUT_FILES_BINARIES} cpp_generate_tool
       )
       list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}")
     else()
-@@ -147,9 +147,9 @@ function(generate_cpp_spirv builtin)
+@@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin)
     )
     add_custom_command(
                        OUTPUT ${OUTPUT_FILE_CPP}
@@ -40,3 +39,13 @@ index 769e2a100..eef25747e 100644
     )
     set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE)
   else()
+@@ -277,4 +277,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "")
+   )
+ endif()
+ 
+-apply_macro_for_each_core_type("SUPPORTED")
+\ No newline at end of file
+apply_macro_for_each_core_type("SUPPORTED")
+-- 
+2.43.2
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch
new file mode 100644
index 00000000..20d9b847
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d52e089778..bc0cf35014 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -727,7 +727,7 @@ if(NOT MSVC)
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
+     endif()
+   endif()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla")
+ 
+   if(USE_SANITIZE_UB)
+     check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER)
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
index 9ee8c96a..5f93b7b6 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch
@@ -1,4 +1,4 @@
-From 1189028d9f77265edf6258a66f8ecadf3aad556a Mon Sep 17 00:00:00 2001
+From 1f58c22992ddea4167b01b44448528de427f50d5 Mon Sep 17 00:00:00 2001
 From: Dongwon Kim <dongwon.kim@intel.com>
 Date: Wed, 2 Mar 2022 15:52:45 -0800
 Subject: [PATCH] external ocloc
@@ -11,7 +11,7 @@ Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
 1 file changed, 8 insertions(+), 6 deletions(-)
 diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake
-index 9b6bd3cd3..0aba48709 100644
+index 2b44330831..03067c9df0 100644
 --- a/cmake/ocloc_cmd_prefix.cmake
 +++ b/cmake/ocloc_cmd_prefix.cmake
 @@ -4,12 +4,14 @@
@@ -22,19 +22,19 @@ index 9b6bd3cd3..0aba48709 100644
 -  set(ocloc_cmd_prefix ocloc)
 -else()
 -  if(DEFINED NEO__IGC_LIBRARY_PATH)
-    set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
 +if(NOT DEFINED ocloc_cmd_prefix)
 +  if(WIN32)
 +    set(ocloc_cmd_prefix ocloc)
   else()
-    set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+-    set(ocloc_cmd_prefix ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib>" $<TARGET_FILE:ocloc>)
 +    if(DEFINED NEO__IGC_LIBRARY_PATH)
-+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
 +    else()
-+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+      set(ocloc_cmd_prefix LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
 +    endif()
   endif()
 endif()
 -- 
-2.20.1
+2.37.3
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_22.38.24278.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
index f7043a18..7280ed03 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.38.24278.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb
@@ -4,27 +4,26 @@ is an open source project to converge Intel's development efforts \
 on OpenCL(TM) compute stacks supporting the GEN graphics hardware \
 architecture."
-LICENSE = "MIT"
+LICENSE = "MIT & Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9280143b568466d8fbe385f838078b93 \
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \
-                    file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
+                    file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=master \
+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 \
+           "
-SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \
+SRCREV = "7131387cdbb02d480a225c70daef913a6c024a6e"
-                               file://external-ocloc.patch \
-                              "
-SRCREV = "f7a4790d84eba7d0ee2028a900625bdfc0c557b3"
 S = "${WORKDIR}/git"
-DEPENDS += " intel-graphics-compiler gmmlib"
+DEPENDS += " intel-graphics-compiler gmmlib libva qemu-native"
-DEPENDS:append:class-target = " intel-compute-runtime-native libva"
 RDEPENDS:${PN} += " intel-graphics-compiler gmmlib"
-inherit cmake pkgconfig
+inherit cmake pkgconfig qemu
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
@@ -40,14 +39,20 @@ EXTRA_OECMAKE = " \
 EXTRA_OECMAKE:append:class-target = " \
                                     -Docloc_cmd_prefix=ocloc \
-                                    "
+                                     -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                                     "
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[levelzero] = "-DBUILD_WITH_L0=ON, -DBUILD_WITH_L0=OFF, level-zero"
-do_install:append:class-native() {
+do_configure:prepend:class-target () {
-    install -d ${D}${bindir}
+    # Write out a qemu wrapper that will be used by cmake.
-    install ${B}/bin/cpp_generate_tool ${D}${bindir}/
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${B}/bin'),d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+    cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
 }
 FILES:${PN} += " \
@@ -57,6 +62,4 @@ FILES:${PN} += " \
 FILES:${PN}-dev = "${includedir}"
-BBCLASSEXTEND = "native nativesdk"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
index 0dd75537..377081fd 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
@@ -1,4 +1,4 @@
-From 16fb6c022380bbb3c48f21372fcb1da7f30d3903 Mon Sep 17 00:00:00 2001
+From 3d71670f8ad5b54d434c2f5f71713bb1d5433ae4 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Tue, 12 Oct 2021 23:46:42 +0800
 Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS
@@ -14,22 +14,22 @@ Upstream-Status: Inappropriate
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
- IGC/VectorCompiler/lib/BiF/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+diff --git a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
-index be8e5557e..07ab40382 100644
+index d20d7f887..882e09fea 100644
--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+--- a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
-+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+++ b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
-@@ -112,7 +112,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
+@@ -109,7 +109,7 @@ function(vc_build_bif TARGET RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
-   add_custom_command(OUTPUT ${BIF_OPT_BC_PATH}
+     COMMENT "vc_build_bif: Translating CMCL builtins:  ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}"
-     COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
+     COMMAND CMCLTranslatorTool -o ${BIF_CMCL_BC_NAME} ${BIF_CLANG_BC_NAME_FINAL}
-     COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
+     COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
-    DEPENDS opt ${BIF_CMCL_BC_PATH})
+-    DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${BIF_CLANG_BC_PATH_FINAL}
-+    DEPENDS ${BIF_CMCL_BC_PATH})
+    DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL}
+     BYPRODUCTS ${BIF_OPT_BC_PATH}
+     SOURCES ${CMCL_SRC_PATH})
   set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
- endfunction()
- 
 -- 
-2.35.3
+2.43.2
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
new file mode 100644
index 00000000..dca75e22
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
@@ -0,0 +1,31 @@
+From e69a3181482e5f442756a61c7b683914072884f1 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Mon, 9 Jan 2023 11:43:05 +0800
+Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers
+We clone the SPIRV headers and tools in a different directory to ensure
+file path substitutions take place.
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ external/SPIRV-Tools/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index 9afa5746c..7ca24d5dc 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
+++ b/external/SPIRV-Tools/CMakeLists.txt
+@@ -43,8 +43,8 @@ else() #By default use build from sources
+  message(STATUS "[SPIRV-Tools] : Building from source")
+  message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+- set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers") # used in subdirectory
+- set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Tools")
+ set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Headers") # used in subdirectory
+ set(SPIRV-Tools_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../SPIRV-Tools")
+ 
+  set(SPIRV-Tools_OUTPUT_DIR "${IGC_OPTION__OUTPUT_DIR}/external/SPIRV-Tools/build")
+  set(IGC_BUILD__SPIRV-Headers_DIR "${SPIRV-Headers_SOURCE_DIR}")
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
index 24367f19..39443931 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
@@ -1,17 +1,19 @@
-From 5329f00de484b470152e2bd3a5ab6dac45668b13 Mon Sep 17 00:00:00 2001
+From 5648568e597acd0fed82aac3e6aef0f95a1b78d1 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Thu, 19 May 2022 22:50:09 +0800
 Subject: [PATCH] fix tblgen
+Upstream-Status: Inappropriate [OE specific]
 ---
 IGC/cmake/igc_llvm.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index 89c03fc49..85be9ae08 100644
+index 10322533c..9020cb3c8 100644
 --- a/IGC/cmake/igc_llvm.cmake
 +++ b/IGC/cmake/igc_llvm.cmake
-@@ -48,7 +48,7 @@ else()
+@@ -52,7 +52,7 @@ else()
   set(LLVM_OPT_EXE "opt" CACHE STRING "")
 
   set(LLVM_TABLEGEN_EXE "llvm-tblgen")
@@ -20,6 +22,3 @@ index 89c03fc49..85be9ae08 100644
     if(DEFINED LLVM_TABLEGEN)
       set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
     else()
-- 
-2.35.3
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
index 7dd36aec..650130a8 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
@@ -1,7 +1,7 @@
-From c2b7f30dd56568482b1b7c2f22bafdf68736fc88 Mon Sep 17 00:00:00 2001
+From 0559332abd04b6c8bc70171d201f43d2e4735336 Mon Sep 17 00:00:00 2001
 From: Lee Chee Yang <chee.yang.lee@intel.com>
 Date: Wed, 2 Sep 2020 08:28:35 +0800
-Subject: [PATCH 3/5] Improve Reproducibility for src package
+Subject: [PATCH] Improve Reproducibility for src package
 Improve reproducibility for intel-graphics-compiler-src package.
 needs to pass build path as environment variable to the build.
@@ -9,12 +9,13 @@ this only works on bison 3.7 onward, hence check for bison version
 before adding the flags.
 Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream]
 Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
 ---
 visa/CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
-index 65dbb4934..8cd607a69 100644
+index 6be467587..930c386a6 100644
 --- a/visa/CMakeLists.txt
 +++ b/visa/CMakeLists.txt
 @@ -123,8 +123,11 @@ endif()
@@ -31,6 +32,3 @@ index 65dbb4934..8cd607a69 100644
 ADD_FLEX_BISON_DEPENDENCY(CISAScanner CISAParser)
 set(CISAScanner_dependencies)
 
-- 
-2.20.1
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch
deleted file mode 100644
index 750a0494..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From c707d1e2244aec988bdd5d2a7473ef3a32a5bac7 Mon Sep 17 00:00:00 2001
-From: Artem Gindinson <artem.gindinson@intel.com>
-Date: Thu, 17 Nov 2022 18:51:03 +0000
-Subject: [PATCH]  Disable opaque pointers in IGC stack for LLVM 15+
-While IGC is a long way from supporting opaque pointers, LLVM 15 has them
-enabled by default. Enforce typed pointers explicitly within all LLVM
-pipelines employed by our stack (unless CMake instructs otherwise).
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- IGC/BiFModule/CMakeLists.txt              |  4 ++--
- IGC/CMakeLists.txt                        |  4 ++++
- IGC/Compiler/CodeGenContext.cpp           |  3 +++
- IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp |  4 ++++
- IGC/VectorCompiler/lib/BiF/CMakeLists.txt |  4 ++--
- IGC/cmake/igc_llvm.cmake                  | 24 +++++++++++++++++++++++
- 6 files changed, 39 insertions(+), 4 deletions(-)
-diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt
-index 60fc5cf8d7d..e87288ca6da 100644
--- a/IGC/BiFModule/CMakeLists.txt
-+++ b/IGC/BiFModule/CMakeLists.txt
-@@ -251,7 +251,7 @@ function(igc_bif_build_bc)
-     add_custom_command(
-         OUTPUT "${_bcTempFilePath}"
-         COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${CMAKE_COMMAND}" -E make_directory "${_outBcFileDir}"
-        COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "$<TARGET_FILE:clang-tool>" -cc1 -x cl -fblocks -fpreserve-vec3-type -opencl-builtins "-triple=${_archTriple}" -w -emit-llvm-bc -o "${_bcTempFilePath}" ${_pchFlags} ${_incFileFlags} ${_includeDirsFlags} ${_defineFlags} ${_options_DEFAULT} ${_options_CL} "${_srcFilePath}"
-+        COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "$<TARGET_FILE:clang-tool>" -cc1 ${IGC_LLVM_DEPENDENT_CLANG_FLAGS} -x cl -fblocks -fpreserve-vec3-type -opencl-builtins "-triple=${_archTriple}" -w -emit-llvm-bc -o "${_bcTempFilePath}" ${_pchFlags} ${_incFileFlags} ${_includeDirsFlags} ${_defineFlags} ${_options_DEFAULT} ${_options_CL} "${_srcFilePath}"
-         DEPENDS clang-tool ${_pchFilePath} ${_incFilePaths} "${_srcFilePath}" ${_dependencies}
-         COMMENT "BiF: \"${_outBcFileName}\": Compiling OpenCL source: \"${_srcFileName}\""
-       )
-@@ -351,7 +351,7 @@ function(igc_bif_build_bc)
-     add_custom_command(
-         OUTPUT "${_bcTempFilePath}"
-         COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${CMAKE_COMMAND}" -E make_directory "${_outBcFileDir}"
-        COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${bif-llvm-opt_exe}" -O2 -o "${_bcTempFilePath}" ${_options_DEFAULT} ${_options_OPT} ${_bcFiles}
-+        COMMAND "${CMAKE_COMMAND}" -E compare_files ${BiFModule_PREBUILD_SHA_PATH} ${BiFModule_SRC_SHA_PATH} || "${bif-llvm-opt_exe}" -O2 -o "${_bcTempFilePath}" ${IGC_LLVM_DEPENDENT_OPT_ARGS} ${_options_DEFAULT} ${_options_OPT} ${_bcFiles}
-         DEPENDS ${_bcFiles} ${_dependencies}
-         COMMENT "BiF: \"${_outBcFileName}\": Optmizing output .bc."
-       )
-diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt
-index 930a552121c..66ea2a3b5ca 100644
--- a/IGC/CMakeLists.txt
-+++ b/IGC/CMakeLists.txt
-@@ -275,6 +275,10 @@ endif()
- # Remove this condition after transition period is over
- option(IGC_OPTION__USE_KHRONOS_SPIRV_TRANSLATOR_IN_SC "[Experimental] Enable usage of Khronos SPIRV-LLVM-Translator in Scalar Compiler" OFF)
- 
-+# TODO: Change this flag to opt-out or remove completely once
-+# opaque pointers are fully supported within the IGC stack.
-+option(IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED "[Experimental] Allow usage of opaque pointers within LLVM transformations" OFF)
-+
- option(IGC_OPTION__ENABLE_LIT_TESTS "Enable lit testing for IGC compiler. May require additional tools like llvm lit and opt" OFF)
- 
- set(IGC_OPTION__BIF_SRC_OCL_DIR "${IGC_SOURCE_DIR}/BiFModule"
-diff --git a/IGC/Compiler/CodeGenContext.cpp b/IGC/Compiler/CodeGenContext.cpp
-index 4abd6e4bf4a..0058571cd27 100644
--- a/IGC/Compiler/CodeGenContext.cpp
-+++ b/IGC/Compiler/CodeGenContext.cpp
-@@ -231,6 +231,9 @@ namespace IGC
-         {
-             CreateResourceDimensionTypes(*this);
-         }
-+#ifdef __IGC_OPAQUE_POINTERS_FORCE_DISABLED__
-+        this->setOpaquePointers(false);
-+#endif
-     }
- 
-     void LLVMContextWrapper::AddRef()
-diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp
-index ef0e5cacd96..c26bfcea74c 100644
--- a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp
-+++ b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp
-@@ -1494,6 +1494,10 @@ namespace TC
-             optionsEx += " -debug-info-kind=line-tables-only -dwarf-version=4";
-         }
- 
-+#ifdef __IGC_OPAQUE_POINTERS_FORCE_DISABLED__
-+        optionsEx += " -no-opaque-pointers";
-+#endif
-+
-         std::string extensionsFromInternalOptions = GetSubstring(pInternalOptions, "-cl-ext=");
- 
-         std::string extensions;
-diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-index 3181a13403c..6235fc1d21e 100644
--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-@@ -90,7 +90,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
- 
-      add_custom_command(OUTPUT "${BIF_CLANG_BC_PATH}"
-       COMMAND clang-tool -cc1 ${CMCL_INCLUDES} ${VC_INCLUDES} ${UTILS_HEADERS}
-               ${EXTRA_CLANG_INCLUDES} ${EXTRA_CLANG_FLAGS}
-+               ${EXTRA_CLANG_INCLUDES} ${IGC_LLVM_DEPENDENT_CLANG_FLAGS} ${EXTRA_CLANG_FLAGS}
-       -x cl -cl-std=clc++ -triple=${SPIR_TARGET}
-       -O2 -disable-llvm-passes -emit-llvm-bc -o "${BIF_CLANG_BC_NAME}" ${CMCL_SRC}
-       COMMENT "vc_build_bif: Compiling CMCL source ${CMCL_SRC} to BC ${BIF_CLANG_BC_NAME}"
-@@ -110,7 +110,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
-     COMMENT "vc_build_bif: Translating CMCL builtins:  ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_CMCL_BC_NAME}"
-     DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL})
-   add_custom_command(OUTPUT ${BIF_OPT_BC_PATH}
-    COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
-+    COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
-     COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
-     DEPENDS opt ${BIF_CMCL_BC_PATH})
-   set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
-diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index c0f74dcea14..96e3b0d1117 100644
--- a/IGC/cmake/igc_llvm.cmake
-+++ b/IGC/cmake/igc_llvm.cmake
-@@ -69,6 +69,30 @@ list(TRANSFORM LLVM_INCLUDE_DIRS PREPEND "-I=" OUTPUT_VARIABLE LLVM_TABLEGEN_FLA
- # Add major version definition for llvm wrapper.
- add_compile_definitions(LLVM_VERSION_MAJOR=${LLVM_VERSION_MAJOR})
- 
-+set(IGC_LLVM_DEPENDENT_CLANG_FLAGS "")
-+set(IGC_LLVM_DEPENDENT_OPT_FLAGS "")
-+
-+# Disable the opaque pointers' usage explicitly, unless the block below deems that unnecessary
-+set(IGC_OPAQUE_POINTERS_FORCE_DISABLED ON)
-+if(IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED)
-+  if(LLVM_VERSION_MAJOR LESS 14)
-+    message(WARNING "IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED ignored: opaque pointers are not available prior to LLVM 14")
-+  endif()
-+  set(IGC_OPAQUE_POINTERS_FORCE_DISABLED OFF)
-+elseif(LLVM_VERSION_MAJOR LESS 15)
-+  # Opaque pointers are either absent (LLVM <14) or disabled by default. No need to force-disable
-+  set(IGC_OPAQUE_POINTERS_FORCE_DISABLED OFF)
-+endif(IGC_OPTION__LLVM_OPAQUE_POINTERS_ENABLED)
-+
-+if(IGC_OPAQUE_POINTERS_FORCE_DISABLED)
-+  # Once we've figured out that explicit disabling is needed, propagate
-+  # corresponding options to all the in-tree calls of clang/opt tools.
-+  list(APPEND IGC_LLVM_DEPENDENT_CLANG_FLAGS "-no-opaque-pointers")
-+  list(APPEND IGC_LLVM_DEPENDENT_OPT_FLAGS "-opaque-pointers=0")
-+  # Also inform the preprocessor.
-+  add_compile_definitions(__IGC_OPAQUE_POINTERS_FORCE_DISABLED__)
-+endif()
-+
- # Include LLVM headers as system ones.
- # This will disable warnings on linux.
- include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch
deleted file mode 100644
index a96be212..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7 Mon Sep 17 00:00:00 2001
-From: Artem Gindinson <artem.gindinson@intel.com>
-Date: Mon, 28 Nov 2022 14:33:44 +0000
-Subject: [PATCH]  Explicitly cast pointers to `int` in BiFModule (LLVM 15)
-Starting from version 15, Clang defaults to
-`-Werror=int-conversion`. Add explicit casts in OpenCL C builtins'
-code where necessary for LLVM 15 buildability.
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- IGC/BiFModule/Implementation/group.cl         | 4 ++--
- IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/IGC/BiFModule/Implementation/group.cl b/IGC/BiFModule/Implementation/group.cl
-index dd6cfd6ba26..df9a2f64f4f 100644
--- a/IGC/BiFModule/Implementation/group.cl
-+++ b/IGC/BiFModule/Implementation/group.cl
-@@ -1897,13 +1897,13 @@ void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageBlockWriteINTEL, _img2d_wo_v2
-     global Img2d_wo* image, int2 coord, TYPE data)                                 \
- {                                                                                  \
-     int id = (int)__builtin_astype(image, __global void*);                         \
-    INTERNAL_FUNC(image, coord, data);                                             \
-+    INTERNAL_FUNC((int)image, coord, data);                                        \
- }                                                                                  \
- void SPIRV_OVERLOADABLE SPIRV_BUILTIN(SubgroupImageBlockWriteINTEL, _img2d_rw_v2i32_##TYPE_ABBR, )(    \
-     global Img2d_rw* image, int2 coord, TYPE data)                                 \
- {                                                                                  \
-     int id = (int)__builtin_astype(image, __global void*);                         \
-    INTERNAL_FUNC(image, coord, data);                                             \
-+    INTERNAL_FUNC((int)image, coord, data);                                        \
- }
- 
- #ifdef cl_intel_subgroups_char
-diff --git a/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl b/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl
-index 062b4f3f49f..1d9d158e9c5 100644
--- a/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl
-+++ b/IGC/BiFModule/Languages/OpenCL/IBiF_Images.cl
-@@ -379,7 +379,7 @@ INLINE int4 OVERLOADABLE read_imagei(read_only image1d_array_t image_array, samp
- 
- INLINE uint4 OVERLOADABLE read_imageui(read_only image1d_array_t image_array, sampler_t sampler, int2 coords) {
-     int id = (int)__builtin_astype(image_array, __global void*);
-    int IDimage_array = __builtin_astype(image_array, __global void*);
-+    int IDimage_array = (int)__builtin_astype(image_array, __global void*);
-     int dt = __builtin_IB_get_image_array_size(IDimage_array);
-     float layer = clamp(rint((float)coords.y), 0.0f, (float)(--dt));
-     if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP_TO_EDGE)
-@@ -395,7 +395,7 @@ INLINE uint4 OVERLOADABLE read_imageui(read_only image1d_array_t image_array, sa
- 
- INLINE uint4 OVERLOADABLE read_imageui(read_only image1d_array_t image_array, sampler_t sampler, float2 coords) {
-     int id = (int)__builtin_astype(image_array, __global void*);
-    int IDimage_array = __builtin_astype(image_array, __global void*);
-+    int IDimage_array = (int)__builtin_astype(image_array, __global void*);
-     int dt = __builtin_IB_get_image_array_size(IDimage_array);
-     float layer = clamp(rint(coords.y), 0.0f, (float)(--dt));
-     if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP)
-@@ -581,7 +581,7 @@ INLINE int4 OVERLOADABLE read_imagei(read_only image2d_array_t image_array, samp
- 
- INLINE uint4 OVERLOADABLE read_imageui(read_only image2d_array_t image_array, sampler_t sampler, int4 coords) {
-     int id = (int)__builtin_astype(image_array, __global void*);
-    int IDimage_array = __builtin_astype(image_array, __global void*);
-+    int IDimage_array = (int)__builtin_astype(image_array, __global void*);
-     int dt = __builtin_IB_get_image_array_size(IDimage_array);
-     float layer = clamp(rint((float)coords.z), 0.0f, (float)(--dt));
-     if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP_TO_EDGE)
-@@ -597,7 +597,7 @@ INLINE uint4 OVERLOADABLE read_imageui(read_only image2d_array_t image_array, sa
- 
- INLINE uint4 OVERLOADABLE read_imageui(read_only image2d_array_t image_array, sampler_t sampler, float4 coords) {
-     int id = (int)__builtin_astype(image_array, __global void*);
-    int IDimage_array = __builtin_astype(image_array, __global void*);
-+    int IDimage_array = (int)__builtin_astype(image_array, __global void*);
-     int dt = __builtin_IB_get_image_array_size(IDimage_array);
-     float layer = clamp(rint(coords.z), 0.0f, (float)(--dt));
-     if ((__builtin_IB_get_address_mode(__builtin_IB_convert_sampler_to_int(sampler)) & 0x07) == CLK_ADDRESS_CLAMP)
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/e09e752949e7af0231884d1b11ea907e3e8b1611.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/e09e752949e7af0231884d1b11ea907e3e8b1611.patch
deleted file mode 100644
index 55cb2a7d..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/e09e752949e7af0231884d1b11ea907e3e8b1611.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e09e752949e7af0231884d1b11ea907e3e8b1611 Mon Sep 17 00:00:00 2001
-From: Artem Gindinson <artem.gindinson@intel.com>
-Date: Fri, 18 Nov 2022 14:48:45 +0000
-Subject: [PATCH]  Additional VC fix of pointer element type API usage
-Quick fixup to the LLVM 15 buildability in the footsteps of commit
-intel/intel-graphics-compiler@b86c1bf.
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp
-index 363d622c24c..c047c545ac8 100644
--- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp
-+++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFRegion.cpp
-@@ -748,12 +748,12 @@ void GenXPredToSimdCF::insertIfGoto(SimdCFIfRegion &R) {
-                                     Mask->getName() + ".not");
-   Value *EM = getEM(M);
-   Instruction *OldGotoEM =
-      Builder.CreateLoad(EM->getType()->getPointerElementType(), EM,
-+      Builder.CreateLoad(IGCLLVM::getNonOpaquePtrEltTy(EM->getType()), EM,
-                          false /*isVolatile*/, EM->getName());
-   OldGotoEM->setDebugLoc(DL);
-   Value *GotoRMAddr = getRMAddr(Br->getSuccessor(0), SimdWidth);
-   Instruction *OldGotoRM = Builder.CreateLoad(
-      GotoRMAddr->getType()->getPointerElementType(), GotoRMAddr,
-+      IGCLLVM::getNonOpaquePtrEltTy(GotoRMAddr->getType()), GotoRMAddr,
-       false /*isVolatile*/, GotoRMAddr->getName());
-   OldGotoRM->setDebugLoc(DL);
-   Type *GotoTys[] = {OldGotoEM->getType(), OldGotoRM->getType()};
-@@ -798,12 +798,12 @@ void GenXPredToSimdCF::insertIfGoto(SimdCFIfRegion &R) {
-   AfterThens[&R] = AfterThen;
- 
-   Builder.SetInsertPoint(AfterThen, AfterThen->begin());
-  auto *OldEM = Builder.CreateLoad(EM->getType()->getPointerElementType(), EM,
-+  auto *OldEM = Builder.CreateLoad(IGCLLVM::getNonOpaquePtrEltTy(EM->getType()), EM,
-                                    false /*isVolatile*/, EM->getName());
-   OldEM->setDebugLoc(DL);
-   auto *RMAddr = getRMAddr(Br->getSuccessor(0), SimdWidth);
-   auto *RM =
-      Builder.CreateLoad(RMAddr->getType()->getPointerElementType(), RMAddr,
-+      Builder.CreateLoad(IGCLLVM::getNonOpaquePtrEltTy(RMAddr->getType()), RMAddr,
-                          false /*isVolatile*/, RMAddr->getName());
-   RM->setDebugLoc(DL);
-   Type *Tys[] = {OldEM->getType(), RM->getType()};
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
index 4cfe7133..24eb97bd 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.12812.9.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
@@ -6,25 +6,23 @@ 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.12812 \
+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=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
+           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=SPIRV-Headers;name=spirv-headers;branch=master \
+           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \
           file://0003-Improve-Reproducibility-for-src-package.patch \
           file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
-           file://c707d1e2244aec988bdd5d2a7473ef3a32a5bac7.patch \
+           file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \
-           file://d1761dfc3ca6b54bac0ee213389a65f84d2aa9b7.patch \
-           file://e09e752949e7af0231884d1b11ea907e3e8b1611.patch \
           "
 SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
-SRCREV_igc = "17eb3abbaa68a238f63d5d549e0a46cfeb71af80"
+SRCREV_igc = "c2495d45f37fadd963ad22eb0cc1a8235a306775"
-SRCREV_vc = "dafb9926e5047a052ef5263dd4ec4fe5f178e5e0"
+SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd"
-SRCREV_spirv-tools = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
+SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
-SRCREV_spirv-headers = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
+SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
@@ -33,15 +31,14 @@ export B
 S = "${WORKDIR}/git"
-inherit cmake pkgconfig
+inherit cmake pkgconfig qemu python3native
 CXXFLAGS:append = " -Wno-error=nonnull"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
-DEPENDS += " flex-native bison-native clang opencl-clang"
+DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native"
-DEPENDS:append:class-target = " clang-cross-x86_64 intel-graphics-compiler-native"
 RDEPENDS:${PN} += "opencl-clang"
@@ -50,27 +47,29 @@ PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV
 EXTRA_OECMAKE = " \
                  -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \
-                  -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
                  -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \
                  -DIGC_OPTION__LLVM_MODE=Prebuilds \
                  -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                  -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \
                  -DCLANG_EXE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
                  "
-do_install:append:class-native () {
+do_configure:prepend:class-target () {
-    install -d ${D}${bindir}
+    # Write out a qemu wrapper that will be used by cmake.
-    install ${B}/IGC/Release/elf_packager ${D}${bindir}/
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
-    if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then
+    cat > ${WORKDIR}/qemuwrapper << EOF
-        install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/
+#!/bin/sh
-        install ${B}/IGC/Release/vcb ${D}${bindir}/
+$qemu_binary "\$@"
-    fi
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
 }
-BBCLASSEXTEND = "native nativesdk"
 UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$"
 FILES:${PN} += " \
                 ${libdir}/igc/NOTICES.txt \
                 "
+# libigc.so contains buildpaths
+INSANE_SKIP:${PN} += "buildpaths"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch
new file mode 100644
index 00000000..031a77c7
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch
@@ -0,0 +1,49 @@
+From 5aea653e611b59c70e529a1bd71885a509831557 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Tue, 1 Aug 2023 11:15:31 +0800
+Subject: [PATCH] cl_headers/CMakeLists.txt: use clang from native sysroot
+Allow clang to be found in target sysroot for target builds and dont try
+to compile cross binaries, we do that ourselves.
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt            | 8 ++++----
+ cl_headers/CMakeLists.txt | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5864009..60ba39e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -35,10 +35,10 @@ set(CMAKE_MODULE_PATH
+ 
+ include(CMakeFunctions)
+ 
+-if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+-  include(CrossCompile)
+-  llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+-endif()
+#if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+#  include(CrossCompile)
+#  llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+#endif()
+ 
+ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+     set(USE_PREBUILT_LLVM ON)
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 16cabb7..4423536 100644
+--- a/cl_headers/CMakeLists.txt
+++ b/cl_headers/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ set(CL_HEADERS_LIB cl_headers)
+ if(USE_PREBUILT_LLVM)
+-    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
+    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR})
+ else()
+     set(CLANG_COMMAND $<TARGET_FILE:clang>)
+ endif()
+-- 
+2.37.3
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
deleted file mode 100644
index 8df7e3ab..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 2 Apr 2020 08:59:20 +0800
-Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE
-Use the value that has been passed by the user.
-Upstream-Status: Submitted
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6893e97..941b0ae 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM)
- set (COMPILE_OPTIONS_TD  opencl_clang_options.td)
- set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
- 
-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+if(NOT DEFINED LLVM_TABLEGEN_EXE)
-+  set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+endif()
-+
- set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
- if(USE_PREBUILT_LLVM)
-   set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
-- 
-2.25.1
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch
new file mode 100644
index 00000000..2f1814f8
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-Request-native-clang-only-when-cross-compiling-464.patch
@@ -0,0 +1,60 @@
+From 43c806ef321b1f677a49d28c89fb7ffecf539c2d Mon Sep 17 00:00:00 2001
+From: Tim Creech <timothy.m.creech@intel.com>
+Date: Wed, 28 Jun 2023 03:45:51 -0400
+Subject: [PATCH 2/2] Request native clang only when cross-compiling (#464)
+* Request native clang only when cross-compiling
+LLVM_USE_HOST_TOOLS may be set if LLVM is configured with
+LLVM_OPTIMIZED_TABLEGEN, which does not necessarily indicate
+cross-compilation or that clang will only execute on the target.
+By checking that CMAKE_CROSSCOMPILING is set, we ensure that we only
+build/use clang again if necessary for host execution.
+* fixup: CMAKE_CROSSCOMPILING implies LLVM_USE_HOST_TOOLS
+Co-authored-by: Wenju He <wenju.he@intel.com>
+* fixup: also use CMAKE_CROSSCOMPILING in top-level CMakeLists.txt
+---------
+Co-authored-by: Wenju He <wenju.he@intel.com>
+Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/53843eee13cfb2357919ee02714a43bef1af0f86]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt            | 2 +-
+ cl_headers/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e772de9..5864009 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(CMAKE_MODULE_PATH
+ 
+ include(CMakeFunctions)
+ 
+-if(LLVM_USE_HOST_TOOLS AND OPENCL_CLANG_BUILD_EXTERNAL)
+if(CMAKE_CROSSCOMPILING AND OPENCL_CLANG_BUILD_EXTERNAL)
+   include(CrossCompile)
+   llvm_create_cross_target(${PROJECT_NAME} NATIVE "" Release)
+ endif()
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 18296c2..16cabb7 100644
+--- a/cl_headers/CMakeLists.txt
+++ b/cl_headers/CMakeLists.txt
+@@ -4,7 +4,7 @@ if(USE_PREBUILT_LLVM)
+ else()
+     set(CLANG_COMMAND $<TARGET_FILE:clang>)
+ endif()
+-if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+if(CMAKE_CROSSCOMPILING AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+   build_native_tool(clang CLANG_COMMAND)
+ endif()
+ 
+-- 
+2.37.3
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
index 0886e43b..31a3fb21 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
@@ -6,6 +6,8 @@ LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e8a15bf1416762a09ece07e44c79118c"
 SRC_URI = "git://github.com/intel/opencl-clang.git;branch=${BRANCH};protocol=https \
+           file://0002-Request-native-clang-only-when-cross-compiling-464.patch \
+           file://0001-cl_headers-CMakeLists.txt-use-clang-from-native-sysr.patch \
           "
 S = "${WORKDIR}/git"
@@ -16,4 +18,17 @@ DEPENDS:append:class-target = " opencl-clang-native"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
+DEPENDS += " spirv-llvm-translator"
+EXTRA_OECMAKE += "\
+                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
+                  -DCMAKE_SKIP_RPATH=TRUE \
+                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
+                  "
+do_install:append:class-native() {
+        install -d ${D}${bindir}
+        install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/
+}
 BBCLASSEXTEND = "native nativesdk"
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 a590b38d..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require opencl-clang.inc
-SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \
-           "
-SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f"
-BRANCH = "ocl-open-140"
-DEPENDS += " spirv-llvm-translator"
-EXTRA_OECMAKE += "\
-                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-                  -DCMAKE_SKIP_RPATH=TRUE \
-                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
-                  "
-do_install:append:class-native() {
-        install -d ${D}${bindir}
-        install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
-}
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
index 217158e9..e946c31c 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_15.0.0.bb
@@ -1,18 +1,5 @@
 require opencl-clang.inc
-SRCREV = "c78c1f884ffe8b40e1681a90ebde1a919c08ddb1"
+SRCREV = "60fd799cc58755c16d951f9ebfde6d0f9b8554dd"
 BRANCH = "ocl-open-150"
-DEPENDS += " spirv-llvm-translator"
-EXTRA_OECMAKE += "\
-                  -DLLVM_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-                  -DCMAKE_SKIP_RPATH=TRUE \
-                  -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
-                  "
-do_install:append:class-native() {
-        install -d ${D}${bindir}
-        install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/
-}
diff --git a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb b/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb
deleted file mode 100644
index 4329fbdc..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/vc-intrinsics/vc-intrinsics_0.1.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "VC Intrinsics"
-DESCRIPTION = "VC Intrinsics project contains a set of new intrinsics on \
-top of core LLVM IR instructions that represent SIMD semantics of a program \
-targeting GPU"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://Readme.md;beginline=1;endline=7;md5=3b2db19c3b0877bb312b7adbcb815adc"
-SRC_URI = "git://github.com/intel/vc-intrinsics.git;protocol=https;branch=master \
-          "
-SRCREV = "b2c98d943986a27016bc735b84ed1655943ef749"
-S = "${WORKDIR}/git"
-PE = "1"
-PV .= "+git${SRCPV}"
-inherit cmake
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-DEPENDS += "  clang"
-EXTRA_OECMAKE = "-DLLVM_DIR=${STAGING_LIBDIR}"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2022.2.0.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.1.0.bb
index b8547cc5..de765d6c 100644
--- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2022.2.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/2022/2;lfs=0 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/1;lfs=0 \
           "
-SRCREV = "bc8582469e7897be0c108e7de48fac79109dfb88"
+SRCREV = "f4afc983258bcb2592d999ed6700043fdb58ad78"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
@@ -20,13 +20,14 @@ inherit setuptools3
 SETUPTOOLS_SETUP_PATH = "${WORKDIR}/git/tools/mo"
 RDEPENDS:${PN} += " \
-                    python3-numpy \
-                    python3-protobuf \
                    python3-defusedxml \
+                    python3-fastjsonschema \
                    python3-networkx \
+                    python3-numpy \
+                    python3-protobuf \
                    python3-requests \
                    python3-urllib3 \
                    bash \
                    "
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2226.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
index e0d6b91e..bdf32576 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2226.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@@ -10,11 +10,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
-inherit cmake systemd features_check
+inherit cmake systemd features_check python3native
-DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native"
+DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native"
-EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3"
 # Enable either connman or networkmanager or none but not both.
 PACKAGECONFIG ??= "connman"
@@ -31,9 +29,10 @@ SYSTEMD_SERVICE:${PN} = "lms.service"
 SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \
           "
-SRCREV = "7f4e295da5df69ae5424df18805af761c6601545"
+SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47"
 do_install:append() {
+    install -d ${D}${sysconfdir}/lms
    install -d ${D}${systemd_system_unitdir}
    install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir}
    install -d ${D}${sysconfdir}/udev/rules.d
@@ -42,5 +41,4 @@ do_install:append() {
 RDEPENDS:${PN} += "ace"
-# This CVE is for Lan Management System software and not this lms.
+CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System."
-CVE_CHECK_IGNORE += "CVE-2018-1000535"
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
new file mode 100644
index 00000000..ea86bc31
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
@@ -0,0 +1,35 @@
+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
+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.
+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
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Makefile.am b/Makefile.am
+index dd2ef10..cb19e17 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -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
+-       $(AM_V_GEN) glib-compile-resources --generate-source thermald-resource.gresource.xml
+       $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $<
+ 
+ CLEANFILES = $(BUILT_SOURCES)
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.1.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
index 2d2562eb..66765e56 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
@@ -7,13 +7,16 @@ compensation using available cooling methods."
 HOMEPAGE = "https://github.com/01org/thermal_daemon"
 DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native upower libevdev"
+DEPENDS += "autoconf-archive-native"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
 SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
+           file://0001-Makefile-Fix-build-Issue.patch \
           "
-SRCREV = "9366c4e9b1850c4a1336682f7f16d9c1a8b03682"
+SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e"
 S = "${WORKDIR}/git"
 inherit pkgconfig autotools systemd gtk-doc
@@ -28,7 +31,7 @@ EXTRA_OECONF = " \
                 --with-systemdsystemunitdir=${systemd_system_unitdir} \
                 "
-FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"
+FILES:${PN} += "${datadir}/dbus-1"
 SYSTEMD_SERVICE:${PN} = "thermald.service"
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch
new file mode 100644
index 00000000..4d583657
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Add-print-function-to-print-test-run-status-in-ptest.patch
@@ -0,0 +1,53 @@
+From deccc0c69c2c8759c52885be8bdda54d3cee481c Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Sun, 11 Dec 2022 22:34:15 +0800
+Subject: [PATCH] Add print function to print test run status in ptest format
+Upstream-Status: Inappropriate [OE ptest specific]
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ run_tests.py | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+diff --git a/run_tests.py b/run_tests.py
+index 1cd796dd..e3ffd1ab 100755
+--- a/run_tests.py
+++ b/run_tests.py
+@@ -327,6 +327,9 @@ def run_test(testname, host, target):
+     else:
+         ispc_exe_rel = add_prefix(host.ispc_cmd, host, target)
+ 
+    # to reslove the error '.rodata' can not be used when making a PIE object
+    ispc_exe_rel = ispc_exe_rel + " --pic"
+
+     # is this a test to make sure an error is issued?
+     want_error = (filename.find("tests_errors") != -1)
+     if want_error == True:
+@@ -795,6 +798,17 @@ def check_compiler_exists(compiler_exe):
+             return
+     error("missing the required compiler: %s \n" % compiler_exe, 1)
+ 
+def print_test_run_status(results):
+    for fstatus in results:
+       if (fstatus[1]  ==  Status.Success):
+          print( "%s: %s" % ("PASS", fstatus[0]))
+       elif (fstatus[1] ==  Status.Compfail):
+          print( "%s: %s" % ("FAIL", fstatus[0]))
+       elif (fstatus[1] ==  Status.Runfail):
+          print( "%s: %s" % ("FAIL", fstatus[0]))
+       elif (fstatus[1] ==  Status.Skip):
+          print( "%s: %s" % ("SKIP", fstatus[0]))
+
+ def print_result(status, results, s, run_tests_log, csv):
+     title = StatusStr[status]
+     file_list = [fname for fname, fstatus in results if status == fstatus]
+@@ -938,6 +952,8 @@ def run_tests(options1, args, print_version):
+         pass_rate = -1
+     print_debug("PASSRATE (%d/%d) = %d%% \n\n" % (len(run_succeed_files), total_tests_executed, pass_rate), s, run_tests_log)
+ 
+    print_test_run_status(results)
+
+     for status in Status:
+         print_result(status, results, s, run_tests_log, options.csv)
+     fails = [status != Status.Compfail and status != Status.Runfail for _, status in results]
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
index e7bb599e..b0a76ff9 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0001-Fix-QA-Issues.patch
@@ -1,4 +1,4 @@
-From 139b94a7fb72114c31a2a6ab3f7e6024b4a738ec Mon Sep 17 00:00:00 2001
+From 7beff95c11071170eb27b6fa7d0cc77588caee8e Mon Sep 17 00:00:00 2001
 From: Yogesh Tyagi <yogesh.tyagi@intel.com>
 Date: Tue, 26 Jul 2022 15:25:10 +0800
 Subject: [PATCH] Fix QA Issues
@@ -8,16 +8,15 @@ Stop ispc from inserting host file path in generated headers which leads to repr
 Upstream-Status: Inappropriate [OE build specific]
 Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
 ---
 src/module.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/src/module.cpp b/src/module.cpp
-index 58a2ae83..82673052 100644
+index e2084d2e..e2626865 100644
 --- a/src/module.cpp
 +++ b/src/module.cpp
-@@ -2105,7 +2105,7 @@ bool Module::writeHeader(const char *fn) {
+@@ -2555,7 +2555,7 @@ bool Module::writeHeader(const char *fn) {
         perror("fopen");
         return false;
     }
@@ -26,7 +25,7 @@ index 58a2ae83..82673052 100644
     fprintf(f, "// DO NOT EDIT THIS FILE.\n//\n\n");
 
     // Create a nice guard string from the filename, turning any
-@@ -2219,7 +2219,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) {
+@@ -2677,7 +2677,7 @@ bool Module::writeDispatchHeader(DispatchHeaderInfo *DHI) {
     FILE *f = DHI->file;
 
     if (DHI->EmitFrontMatter) {
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
index a13ade9f..f452dc50 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/0002-cmake-don-t-build-for-32-bit-targets.patch
@@ -1,4 +1,4 @@
-From 493e886d6dae2ed7bdc12ed03f717ee0e98dfe09 Mon Sep 17 00:00:00 2001
+From 16a2c22339287122d2c25d8bb33a5a51b4e6ee51 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Thu, 24 Feb 2022 20:01:11 +0530
 Subject: [PATCH] cmake: don't build for 32-bit targets
@@ -16,14 +16,14 @@ Upstream-Status: Inappropriate
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- cmake/GenerateBuiltins.cmake | 8 ++++----
+ cmake/GenerateBuiltins.cmake | 6 +++---
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
-index fa228247..7adc7e52 100644
+index f84494ed..d90cb1ec 100644
 --- a/cmake/GenerateBuiltins.cmake
 +++ b/cmake/GenerateBuiltins.cmake
-@@ -272,7 +272,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
+@@ -253,7 +253,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
             #   In this case headers will be installed in /usr/arm-linux-gnueabihf/include and will not be picked up
             #   by clang by default. So the following line adds such path explicitly. If this path doesn't exist and
             #   the headers can be found in other locations, this should not be a problem.
@@ -32,7 +32,7 @@ index fa228247..7adc7e52 100644
         endif()
     endif()
 
-@@ -354,7 +354,7 @@ function (generate_target_builtins resultList)
+@@ -339,7 +339,7 @@ function (generate_target_builtins resultList)
     set(regular_targets ${ARGN})
     list(FILTER regular_targets EXCLUDE REGEX wasm)
     foreach (ispc_target ${regular_targets})
@@ -41,24 +41,12 @@ index fa228247..7adc7e52 100644
             foreach (os_name ${TARGET_OS_LIST_FOR_LL})
                 target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit})
                 list(APPEND tmpList ${output${os_name}${bit}})
-@@ -415,7 +415,7 @@ function (generate_common_builtins resultList)
+@@ -405,7 +405,7 @@ function (generate_common_builtins resultList)
     endif()
 
     message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}")
 -    foreach (bit 32 64)
 +    foreach (bit 64)
         foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web")
-             foreach (arch "x86" "arm" "wasm32")
+             foreach (arch "x86" "arm" "wasm")
                 builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch})
-@@ -428,7 +428,7 @@ function (generate_common_builtins resultList)
-         endforeach()
-     endforeach()
-     if (XE_ENABLED)
-        foreach (bit 32 64)
-+        foreach (bit 64)
-             builtin_xe_to_cpp(${bit} res_xe_${bit})
-             list(APPEND tmpList ${res_xe_${bit}} )
-             if(MSVC)
-- 
-2.17.1
diff --git a/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
new file mode 100644
index 00000000..77d13bb4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc/run-ptest
@@ -0,0 +1,2 @@
+#!/bin/sh
+python3 run_tests.py
diff --git a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.18.0.bb b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb
index 6a2e6059..ed8df859 100644
--- a/dynamic-layers/clang-layer/recipes-core/ispc/ispc_1.18.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/ispc/ispc_1.23.0.bb
@@ -5,25 +5,29 @@ HOMEPAGE = "https://github.com/ispc/ispc"
 LICENSE  = "BSD-3-Clause & Apache-2.0-with-LLVM-exception"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=da5ecffdd210b3cf776b32b41c182e87 \
-                    file://third-party-programs.txt;md5=3cd6f8a7c3bd9d2bb898fcb27c75221a"
+                    file://third-party-programs.txt;md5=2061218c7be521556719c8b504bf9ddd"
-inherit cmake python3native
+inherit cmake python3native ptest
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
-           file://0001-CMakeLists.txt-link-with-libclang-cpp-library-instea.patch \
           file://0002-cmake-don-t-build-for-32-bit-targets.patch \
           file://0001-Fix-QA-Issues.patch \
-           file://6a1b2ffae0cc12467838bc671e3b089924de90a6.patch \
+           file://0001-Add-print-function-to-print-test-run-status-in-ptest.patch \
-           file://ec35a6f8e60ba77e59a6f2bfec27011e0ab34dda.patch \
+           file://run-ptest \
           "
-SRCREV = "f7ec3aa173c816377c215d83196b5c7c3a88db1c"
+SRCREV = "bcb2cf896c00f9a802a11cbf291ef6e44b205416"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 DEPENDS += " clang-native bison-native flex-native"
-RDEPENDS:${PN} += " clang-libllvm clang clang-libclang-cpp"
+DEPENDS:append:class-target = " clang"
+RDEPENDS:${PN}-ptest += " python3-multiprocessing"
+PACKAGECONFIG ??= "tbb"
+PACKAGECONFIG[tbb] = "-DISPCRT_BUILD_TASK_MODEL=TBB, -DISPCRT_BUILD_TASK_MODEL=OpenMP, tbb"
 YFLAGS='-d -t -v -y --file-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}'
@@ -32,18 +36,29 @@ do_configure:prepend() {
        sed -i -e 's#\${FLEX_EXECUTABLE}.*#\${FLEX_EXECUTABLE} \-L #g' ${S}/CMakeLists.txt
 }
+do_install_ptest() {
+        cp -rf ${S}/run_tests.py ${D}${PTEST_PATH}
+        cp -rf ${S}/common.py ${D}${PTEST_PATH}
+        cp -rf ${S}/tests ${D}${PTEST_PATH}
+        cp -rf ${S}/test_static.isph ${D}${PTEST_PATH}
+        cp -rf ${S}/fail_db.txt ${D}${PTEST_PATH}
+        cp -rf ${S}/test_static.cpp ${D}${PTEST_PATH}
+}
 EXTRA_OECMAKE += " \
                  -DISPC_INCLUDE_TESTS=OFF  \
                  -DISPC_INCLUDE_EXAMPLES=OFF  \
-                  -DISPC_NO_DUMPS=ON  \
                  -DARM_ENABLED=OFF  \
                  -DISPC_CROSS=ON  \
                  -DISPC_ANDROID_TARGET=OFF  \
                  -DISPC_FREEBSD_TARGET=OFF  \
                  -DISPC_WINDOWS_TARGET=OFF  \
                  -DISPC_IOS_TARGET=OFF  \
-                  -DISPC_PS4_TARGET=OFF  \
+                  -DISPC_PS_TARGET=OFF  \
-                  -DSYSROOT_DIR=${STAGING_DIR_NATIVE}  \
+                  -DSYSROOT_DIR=${STAGING_DIR} \
+                  -DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \
+                  -DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \
+                  -DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \
                  "
 BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.7.15.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb
index a63c30bc..8bade9f4 100644
--- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.7.15.bb
+++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.15.8.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=97957beb2f7808ffa247e5d93e6442cc"
 SRC_URI = "git://github.com/oneapi-src/level-zero.git;protocol=https;branch=master"
-SRCREV = "bb7fff05b801e26c3d7858e03e509d1089914d59"
+SRCREV = "1685d01497428ca4d8b99200972b64685424d5c9"
 S = "${WORKDIR}/git"
 inherit cmake
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/compiler/intel-oneapi-compiler_2022.0.1-3633.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb
deleted file mode 100644
index b9d4fdf6..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/compiler/intel-oneapi-compiler_2022.0.1-3633.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "Intel® oneAPI DPC++/C++ Compiler & Intel® C++ Compiler Classic runtime common files"
-DESCRIPTION = "Intel® C++ Compiler Classic generates applications\
- that can run on Intel® 64 architecture and the IA-32 architecture.\
- Intel® oneAPI Data Parallel C++ (DPC++) is an open alternative \
- to single-architecture proprietary languages. It allows developers to reuse \
- code across hardware targets (CPUs and accelerators such as GPUs and FPGAs) \
- and also perform custom tuning for a specific accelerator."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/documentation/cpp-compiler-developer-guide-and-reference/top/introducing-the-intel-c-compiler-classic.html"
-LICENSE="EULA"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/compiler/Intel%20Developer%20Tools%20EULA;md5=7bfc91523de2e84e7131d0eacf2827d4 \
-                     file://opt/intel/oneapi/lib/licensing/compiler/openmp/third-party-programs.txt;md5=da72b17a4a1efef54faf14df4a703282 \
-                     file://opt/intel/oneapi/lib/licensing/compiler/c/third-party-programs.txt;md5=3414f5649b09160ade46d4981f3452fe \
-                     file://opt/intel/oneapi/lib/licensing/opencl/EULA.txt;md5=7bfc91523de2e84e7131d0eacf2827d4 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/TBB_TPP.txt;md5=0a69156543e3e115c673c6041b6aee92 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/redist.txt;md5=32fb3b7d1c0a92ea577fe2e4b0dfa663 \
-                     file://opt/intel/oneapi/lib/licensing/opencl/third-party-programs.txt;md5=c660b8b0891e780a62da6a198e80e9ac \
-                     "
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-${PV}_amd64.deb;subdir=${BPN};name=runtime-compilers \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-compilers-common-${PV}_all.deb;subdir=${BPN};name=common-compilers \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-${PV}_amd64.deb;subdir=${BPN};name=runtime-dpcpp-cpp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-dpcpp-cpp-common-${PV}_all.deb;subdir=${BPN};name=common-dpcpp-cpp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-${PV}_amd64.deb;subdir=${BPN};name=runtime-openmp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-common-${PV}_all.deb;subdir=${BPN};name=common-openmp \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-opencl-${PV}_amd64.deb;subdir=${BPN};name=runtime-opencl \
-            "
-SRC_URI[runtime-compilers.sha256sum] = "8951fd8a0946095609f0ef7bb2b51c698fc0315455a76d268a54851936c07db9"
-SRC_URI[common-compilers.sha256sum] = "c592482f68b131fff0623fdc978c592950f02d7f35f6795587e93a28fe1d3c31"
-SRC_URI[runtime-dpcpp-cpp.sha256sum] = "9e26b9c5321281d829d62542c22552182d00255ebc2f8a6e179b95515c63c24d"
-SRC_URI[common-dpcpp-cpp.sha256sum] = "9cd0957a75f5ad45b208f2c1c8ee2aa032e335ada9193ca69f8ac5a7cb548d02"
-SRC_URI[runtime-openmp.sha256sum] = "86fb0d6e3a34217cc30594e9f21e89070425c6c56773edae4d5a86730239c171"
-SRC_URI[common-openmp.sha256sum] = "5bd2fc7a1605545fc8536ec0e8d80c982f1feb7dc6eed5b45adf3cd0370e0a98"
-SRC_URI[runtime-opencl.sha256sum] = "65d73c23f07c2419b8a1d22043b73346f25b387d3ec07b48f08177de1835a360"
-S = "${WORKDIR}/${BPN}"
-inherit bin_package update-alternatives
-ALTERNATIVE:${PN} = "Intel_FPGA_SSG_Emulator.icd"
-ALTERNATIVE_LINK_NAME[Intel_FPGA_SSG_Emulator.icd] = "/etc/OpenCL/vendors/intel64-fpgaemu.icd"
-ALTERNATIVE_TARGET[Intel_FPGA_SSG_Emulator.icd] = "/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd"
-ALTERNATIVE_PRIORITY[Intel_FPGA_SSG_Emulator.icd] = "328736233"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-RDEPENDS:${PN} += "perl elfutils ocl-icd level-zero-loader zlib tbb libelf setup-intel-oneapi-env"
-INSANE_SKIP:${PN} += "textrel dev-so"
-# The libomptarget.rtl.x86_64.so library is not supported on Yocto 3.1+ due to using obsolete libffi.so.6
-do_install:append () {
-    rm -f ${D}/opt/intel/oneapi/lib/libomptarget.rtl.x86_64.so
-    echo "/opt/intel/oneapi/lib/emu/libintelocl_emu.so" > ${D}/opt/intel/oneapi/lib/etc/Intel_FPGA_SSG_Emulator.icd
-}
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2022.1.0-3768.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2022.1.0-3768.bb
deleted file mode 100644
index 8fe3b1d3..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2022.1.0-3768.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files"
-DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
-that help your applications run faster on Intel® 64 architectures with support \
-for the latest C, C++, and SYCL language standards. This compiler produces \
-optimized code that can run significantly faster by taking advantage of the \
-ever-increasing core count and vector register width in Intel® Xeon® processors \
-and compatible processors."
-HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
-LICENSE="EULA"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/licensing/2022.1.0/license.htm;md5=f721d37d5ef65590e052bc47e15feec3 \
-                     "
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-2022.1.0-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-2022.1.0-161_all.deb;subdir=${BPN};name=common-vars \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-2022.1.0-${PV}_all.deb;subdir=${BPN};name=openmp-common \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-2022.1.0-2022.1.0-161_all.deb;subdir=${BPN};name=license \
-            "
-SRC_URI[dpcpp-runtime.sha256sum] = "746d30e0794d0b60ab3d7cd31be9d7981b98c2b0305c238f1a9af5612a22b123"
-SRC_URI[dpcpp-common.sha256sum] = "5bc6452a32f5781c96498515d061d8fe9d7bba13b41eb983fe9bb0f792621906"
-SRC_URI[compiler-shared-runtime.sha256sum] = "c748adc3bac2f0f4c3419f0b1e5bdc34d1508832819deeef68336c290a2fd2be"
-SRC_URI[common-vars.sha256sum] = "52a2726739652b4d3021a9f21d8ca664cd5582853b561e421f003b94789a4469"
-SRC_URI[openmp-common.sha256sum] = "aaa06115d6cbad606373a61a512162f132c52360f6058970d7a4df55300fb826"
-SRC_URI[license.sha256sum] = "30f36ef653964ac629ce77c2c2d21a923c7ba4ff88936c39a8f39237b7446cca"
-S = "${WORKDIR}/${BPN}"
-inherit bin_package
-RDEPENDS:${PN} += "ocl-icd zlib tbb level-zero-loader bash"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-# doesn't have GNU_HASH (didn't pass LDFLAGS?)
-INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths"
-FILES_SOLIBSDEV = ""
-BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
new file mode 100644
index 00000000..cedbae1e
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp-runtime_2024.0.0-49819.bb
@@ -0,0 +1,54 @@
+SUMMARY = "Intel® oneAPI DPC++/C++ Compiler runtime files"
+DESCRIPTION = "The Intel® oneAPI DPC++/C++ Compiler provides optimizations \
+that help your applications run faster on Intel® 64 architectures with support \
+for the latest C, C++, and SYCL language standards. This compiler produces \
+optimized code that can run significantly faster by taking advantage of the \
+ever-increasing core count and vector register width in Intel® Xeon® processors \
+and compatible processors."
+HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler.html"
+LICENSE="EULA"
+COMPILERMAINVER = "2024.0"
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/licensing/${COMPILERMAINVER}/licensing/${COMPILERMAINVER}/license.htm;md5=5ff64c6ff3ef98089ed69360e7a84c39 \
+                     "
+COMPILERDOTVER = "2024.0.0-49406"
+DEVUTILITVERSION = "2024.0-2024.0.0-49320"
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=dpcpp-runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-dpcpp-cpp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=dpcpp-common \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-runtime-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-shared-runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-vars-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=common-vars \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=openmp \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-openmp-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=openmp-common \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-common-licensing-${COMPILERMAINVER}-${COMPILERDOTVER}_all.deb;subdir=${BPN};name=license \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dev-utilities-${DEVUTILITVERSION}_amd64.deb;subdir=${BPN};name=dev-utils \
+            "
+SRC_URI[dpcpp-runtime.sha256sum] = "e24f0ba69daf3f66ceaf23d5e632f183cdb90bac69f65407fdb4407fc9034f33"
+SRC_URI[dpcpp-common.sha256sum] = "f5a3db6a725598224edf1099260955aee3e36beadcaed2af5b8b453e873a82fa"
+SRC_URI[compiler-shared-runtime.sha256sum] = "bce010cbe076259ddd3feb8e69792869e22fccd5b4e2c9af9e815826f2c1a394"
+SRC_URI[common-vars.sha256sum] = "368553c99db1b52060b8225355336778be0b00e5991d0f769c42f891c6328750"
+SRC_URI[openmp.sha256sum] = "154ff1e81adfdc872ba1d47bd860de70d62188417c7128422435dfd0ceca62fe"
+SRC_URI[openmp-common.sha256sum] = "8217001d78311cbef97dd139e684c6767932b532309c3843ba57d7894d15c07d"
+SRC_URI[license.sha256sum] = "9f9c8a12fc0bc82ab5b71e118e66745eff23f42224eba304068225b366cd74b6"
+SRC_URI[dev-utils.sha256sum] = "c675d960a5abca361cead9217d6e74adee499ee0a095c4e44092bd710b304d50"
+S = "${WORKDIR}/${BPN}"
+inherit bin_package
+RDEPENDS:${PN} += "virtual-opencl-icd zlib tbb level-zero-loader bash tcsh"
+SKIP_FILEDEPS:${PN} = '1'
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+# doesn't have GNU_HASH (didn't pass LDFLAGS?)
+INSANE_SKIP:${PN} += "textrel dev-so dev-elf ldflags already-stripped staticdev rpaths arch useless-rpaths file-rdeps"
+FILES_SOLIBSDEV = ""
+BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2022.1.0-3768.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
index e396f1e7..90ada087 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2022.1.0-3768.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/dpcpp-compiler/intel-oneapi-dpcpp-cpp_2024.0.0-49819.bb
@@ -10,19 +10,21 @@ HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-c
 LICENSE="EULA"
+COMPILERMAINVER = "2024.0"
 LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/compiler/2022.1.0/licensing/credist.txt;md5=f772f43824318f221f6363883e44201f \
+                     file://opt/intel/oneapi/compiler/${COMPILERMAINVER}/share/doc/compiler/credist.txt;md5=b41f55af9f479b9570fc35b955d5ba1a \
                     "
 SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-dpcpp-cpp-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=icx-compiler \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-2022.1.0-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-${COMPILERMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=compiler-linker \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-2022.1.0-${PV}_all.deb;subdir=${BPN};name=shared-common \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-compiler-shared-common-${COMPILERMAINVER}-${PV}_all.deb;subdir=${BPN};name=shared-common \
            "
-SRC_URI[icx-compiler.sha256sum] = "c525c416c61cac9aa4e22fec78be95b88d33bca13360d0444c22da52eb8dd318"
+SRC_URI[icx-compiler.sha256sum] = "0dcbac766d5a1519d4cf393f5a85e71d19024fef65f77638f3f849796b62cd82"
-SRC_URI[compiler-linker.sha256sum] = "3185dc02473b3d3a34234dd82a17c285e43701455636f93be235b52c2ac6f2c6"
+SRC_URI[compiler-linker.sha256sum] = "e00faea6d797934d62143e4aa70b727ce30f80fdf30769d22122b3051140c236"
-SRC_URI[shared-common.sha256sum] = "c9961b90a9c4f4636c78292b5ba3d6cf6bbd7081f1ce4a4690bb7db94596226e"
+SRC_URI[shared-common.sha256sum] = "cf490a4a790f349da79e618359598d3b32312ca3b2639e5d4c84e1cfa2745558"
 S = "${WORKDIR}/${BPN}"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.5.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
index 038bffce..fb341b01 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_3.13.5.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/embree/embree_4.3.1.bb
@@ -6,15 +6,15 @@ HOMEPAGE = "https://github.com/embree/embree"
 LICENSE  = "Apache-2.0 & syrah"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://third-party-programs.txt;md5=86f6028ba2138fe41ac5c121d0a3518e \
+                    file://third-party-programs.txt;md5=f989f5b74cfff0d45d3ccf0e1366cbdc \
                    file://common/math/transcendental.h;beginline=6;endline=8;md5=73380bb2ab6613b30b8464f114bd0ca8"
 inherit pkgconfig cmake
 S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=devel3"
+SRC_URI = "git://github.com/embree/embree.git;protocol=https;branch=master"
-SRCREV = "698442324ccddd11725fb8875275dc1384f7fb40"
+SRCREV = "daa8de0e714e18ad5e5c9841b67c1950d9c91c51"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
@@ -22,9 +22,9 @@ COMPATIBLE_HOST:libc-musl = "null"
 DEPENDS = "tbb jpeg libpng glfw ispc-native"
 EXTRA_OECMAKE += " \
-                  -DEMBREE_ISPC_SUPPORT=OFF  \
                  -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF  \
                  -DEMBREE_MAX_ISA=DEFAULT  \
                  -DEMBREE_TUTORIALS=OFF  \
                  -DEMBREE_ISPC_SUPPORT=ON  \
+                  -DEMBREE_ZIP_MODE=OFF  \
                  "
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
new file mode 100644
index 00000000..1841253e
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \
+ building blocks for cross-platform performance. Develop high-performance vision, \
+ signal, security, and storage applications with this multithreaded software library."
+HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html"
+LICENSE = "ISSL"
+MAXVER = "2021.10"
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/license.txt;md5=d7cdc92ed6c4de1263da879599ddc3e2 \
+                     file://opt/intel/oneapi/ipp/${MAXVER}/share/doc/ipp/licensing/third-party-programs.txt;md5=22bd13987911dcf790907041b43081f3 \
+                     "
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-${MAXVER}-${PV}_amd64.deb;subdir=${BPN};name=ipp \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-devel-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=headers \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-ipp-common-${MAXVER}-${PV}_all.deb;subdir=${BPN};name=env \
+            "
+SRC_URI[ipp.sha256sum] = "b51e45c6e691aa46c7136b0ab61f5abe346388433e017a30cf53fd23e92bea07"
+SRC_URI[headers.sha256sum] = "342f37ab2f82bc9f4498435f848ee660591c2488b44d988bf6ee96b2a71fd005"
+SRC_URI[env.sha256sum] = "731e8c28a3b8b757730cd874d0941de2eb744856128f24ade59d36c12b415bf6"
+S = "${WORKDIR}/${BPN}"
+COMPATIBLE_HOST:libc-musl = "null"
+inherit bin_package
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+INHIBIT_DEFAULT_DEPS = ""
+RDEPENDS:${PN} += "tbb setup-intel-oneapi-env"
+INSANE_SKIP:${PN} += "ldflags dev-so"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb
deleted file mode 100644
index ae764253..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.5.1-522.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "Intel® Integrated Performance Primitives are production-ready \
- building blocks for cross-platform performance. Develop high-performance vision, \
- signal, security, and storage applications with this multithreaded software library."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html"
-LICENSE = "ISSL"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/ipp/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \
-                     file://opt/intel/oneapi/lib/licensing/ipp/third-party-programs.txt;md5=6cd9ad51f3b5cdfd4a355fa5599a6c03 \
-                     "
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-${PV}_amd64.deb;subdir=${BPN};name=runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-ipp-common-${PV}_all.deb;subdir=${BPN};name=common \
-            "
-SRC_URI[runtime.sha256sum] = "98cd14bf635969d57bf9ea7bb27b90f27f72404f1927aa486a2bcf3c20a0f303"
-SRC_URI[common.sha256sum] = "1aac41633179e824567b90afd39b8405db30df79a027421568df019b2b51bdd1"
-S = "${WORKDIR}/${BPN}"
-COMPATIBLE_HOST:libc-musl = "null"
-inherit bin_package
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-RDEPENDS:${PN} += "tbb setup-intel-oneapi-env"
-INSANE_SKIP:${PN} += "ldflags dev-so"
-# Some libraries are linking against the unversioned lib and there's no soname entry.
-# Workaround errors like:
-# Problem: conflicting requests
-#  - nothing provides libippcore_tl_omp.so()(64bit) needed by intel-oneapi-ipp-2021.3.0+333-r0.skylake_64
-do_install:append () {
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_omp.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippcore_tl_tbb.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_omp.so
-    install -m 755 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so.10.4 ${D}/opt/intel/oneapi/lib/intel64/libippi_tl_tbb.so
-}
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb
deleted file mode 100644
index 2e9c17e3..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2022.0.1-117.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)"
-DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \
- math library of highly optimized and extensively parallelized routines \
- for applications that require maximum performance. oneMKL contains \
- the high-performance optimizations from the full Intel® Math Kernel Library \
- for CPU architectures (with C/Fortran programming language interfaces)\
- and adds to them a set of DPC++ programming language interfaces for \
- achieving performance on various CPU architectures \
- and Intel Graphics Technology for certain key functionalities."
-HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html"
-LICENSE = "ISSL"
-LIC_FILES_CHKSUM = " \
-                     file://opt/intel/oneapi/lib/licensing/mkl/license.txt;md5=0c8b92562c3c165187e2c15ff638855e \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \
-                     file://opt/intel/oneapi/lib/licensing/mkl/third-party-programs.txt;md5=980965cf1f086d40998ca4981968b6a4 \
-                     "
-MKLMAINVER = "2022.0.1"
-SRC_URI = " \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-${PV}_amd64.deb;subdir=${BPN};name=runtime \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-mkl-common-${PV}_all.deb;subdir=${BPN};name=common \
-            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=devel \
-            "
-SRC_URI[runtime.sha256sum] = "b20e0f7400fbbc55d8489f9f3ef35a8c8df7f5af7d87903bf305703e3a2ebc3b"
-SRC_URI[common.sha256sum] = "bff8b2bfedbd09c9e6d0366cca3d4de80af521302bd5938fe6fa0128c6839041"
-SRC_URI[devel.sha256sum] = "1c84c0b72638415318229326cb143691a5914d5e88552abef39391db3d285cff"
-S = "${WORKDIR}/${BPN}"
-inherit bin_package
-do_install:append () {
-        install -d ${D}${libdir}
-        (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/lib/intel64/*.so* .)
-        install -d ${D}${libdir}/pkgconfig
-        (cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .)
-        install -d ${D}${libdir}/cmake
-        (cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .)
-        install -d ${D}${includedir}
-        (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/* .)
-}
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
-RDEPENDS:${PN} += "bash tbb intel-oneapi-compiler setup-intel-oneapi-env"
-INSANE_SKIP:${PN} = "ldflags textrel dev-so"
-SYSROOT_DIRS += "/opt"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
new file mode 100644
index 00000000..e3e93028
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/mkl/intel-oneapi-mkl_2024.0.0-49656.bb
@@ -0,0 +1,74 @@
+SUMMARY = "Intel® oneAPI Math Kernel Library (oneMKL)"
+DESCRIPTION = "The Intel® oneAPI Math Kernel Library (oneMKL) is a computing \
+ math library of highly optimized and extensively parallelized routines \
+ for applications that require maximum performance. oneMKL contains \
+ the high-performance optimizations from the full Intel® Math Kernel Library \
+ for CPU architectures (with C/Fortran programming language interfaces)\
+ and adds to them a set of DPC++ programming language interfaces for \
+ achieving performance on various CPU architectures \
+ and Intel Graphics Technology for certain key functionalities."
+HOMEPAGE = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html"
+LICENSE = "ISSL"
+MKLMAINVER = "2024.0"
+LIC_FILES_CHKSUM = " \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/license.txt;md5=8510d21bf355a76e378c3216c3929ccd  \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-benchmarks.txt;md5=cb98e1a1f14c05ea85a979ea8982e7a4 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-ipp.txt;md5=a4b2bf15e38f5c1267cdafed18bc0b09 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-openmp.txt;md5=6b3c1aa2a11393060074c0346ce21e49 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs-safestring.txt;md5=c3aeee91c6d35a0f0753aed6c2633b82 \
+                     file://opt/intel/oneapi/mkl/${MKLMAINVER}/share/doc/mkl/licensing/third-party-programs.txt;md5=27de873e4084d62530fe828406b33ca9 \
+                     "
+SRC_URI = " \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=runtime \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-devel-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-devel \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-devel-${MKLMAINVER}-${PV}_amd64.deb;subdir=${BPN};name=devel \
+            https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-mkl-common-${MKLMAINVER}-${PV}_all.deb;subdir=${BPN};name=common-vars \
+            "
+SRC_URI[runtime.sha256sum] = "10a86e24051d6ef4a80fd839c570e629190638a3c0ac9bcca99ab855f534b959"
+SRC_URI[common-devel.sha256sum] = "adbf0ea946f63946d29b7f9c750c38a42ea7a65d8c81655b268aa2c7bb908192"
+SRC_URI[devel.sha256sum] = "fab2a6f15e18bfd9b4d425f2703e4e98928c57f52c4feebc9ed886f097062e84"
+SRC_URI[common-vars.sha256sum] = "ec2b67813739fa4a2895f63479a41acba2174afe2d0cb8a0c1c9119d1317d8ef"
+S = "${WORKDIR}/${BPN}"
+inherit bin_package
+do_install:append () {
+        install -d ${D}${bindir}
+        (cd ${D}${bindir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/bin/* .)
+        install -d ${D}${libdir}
+        (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.so* .)
+        (cd ${D}${libdir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/intel64/*.a* .)
+        install -d ${D}${libdir}/pkgconfig
+        (cd ${D}${libdir}/pkgconfig ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/pkgconfig/* .)
+        install -d ${D}${libdir}/cmake
+        (cd ${D}${libdir}/cmake ; ln -s ../../../opt/intel/oneapi/mkl/${MKLMAINVER}/lib/cmake/* .)
+        install -d ${D}${includedir}
+        find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read srcdir; do
+            install -d ${D}${includedir}/$srcdir
+            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcdir/* ./$srcdir/)
+        done
+        find ${D}/opt/intel/oneapi/mkl/${MKLMAINVER}/include/ -mindepth 1 -maxdepth 1 -type f -printf '%f\n' | while read srcfile; do
+            (cd ${D}${includedir} ; ln -s ../../opt/intel/oneapi/mkl/${MKLMAINVER}/include/$srcfile .)
+        done
+}
+AUTO_LIBNAME_PKGS = ""
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT  = "1"
+RDEPENDS:${PN} += "bash tbb intel-oneapi-dpcpp-cpp-runtime setup-intel-oneapi-env virtual-opencl-icd"
+INSANE_SKIP:${PN} = "ldflags textrel dev-so staticdev arch already-stripped"
+FILES:${PN}-staticdev += "/opt/intel/oneapi/mkl/${MKLMAINVER}/lib/*.a*"
+SKIP_FILEDEPS:${PN} = '1'
+SYSROOT_DIRS += "/opt"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
deleted file mode 100644
index 0f39a581..00000000
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn/0001-remove-redundant-RPATH.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 46b7de8c4ae0cc34805c2a11356c5a730fb8760a Mon Sep 17 00:00:00 2001
-From: Ezhilarasan <ezhilarasanx.s@intel.com>
-Date: Fri, 4 Mar 2022 21:04:47 +0530
-Subject: [PATCH] remove-redundant-RPATH
-Error Log:
-ERROR: oidn-1.4.3-r0 do_package_qa: QA Issue: oidn: /usr/lib/libOpenImageDenoise.so.1.4.3 contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnTest contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnDenoise contains probably-redundant RPATH /usr/lib
-oidn: /usr/bin/oidnBenchmark contains probably-redundant RPATH /usr/lib [useless-rpaths]
-ERROR: oidn-1.4.3-r0 do_package_qa: Fatal QA errors were found, failing task.
-Remove the redundant RPATH
-Upstream-Status: Inappropriate
-Signed-off-by: Ezhilarasan <ezhilarasanx.s@intel.com>
---
- cmake/oidn_package.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/cmake/oidn_package.cmake b/cmake/oidn_package.cmake
-index 1f76af8..46c0854 100644
--- a/cmake/oidn_package.cmake
-+++ b/cmake/oidn_package.cmake
-@@ -29,7 +29,7 @@ if(OIDN_ZIP_MODE)
-     set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-   endif()
- else()
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
-+#  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- endif()
- 
- ## -----------------------------------------------------------------------------
-- 
-2.17.1
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
index 8e055a57..4ea6ffbe 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_1.4.3.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/oidn/oidn_2.1.0.bb
@@ -7,15 +7,14 @@ HOMEPAGE = "https://www.openimagedenoise.org/"
 LICENSE = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-                    file://mkl-dnn/LICENSE;md5=8e17c0f9656ebaf0c380d9b22707c846 \
+                    file://external/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
-                    file://mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
+                    file://external/mkl-dnn/src/cpu/x64/xbyak/COPYRIGHT;md5=3b9bf048d063d54cdb28964db558bcc7 \
-                    file://mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
+                    file://external/mkl-dnn/src/common/ittnotify/LICENSE.BSD;md5=e671ff178b24a95a382ba670503c66fb \
                    file://weights/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "https://github.com/OpenImageDenoise/${BPN}/releases/download/v${PV}/${BP}.src.tar.gz\
-           file://0001-remove-redundant-RPATH.patch \
           "
-SRC_URI[sha256sum] = "3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a"
+SRC_URI[sha256sum] = "ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6"
 inherit cmake
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.3.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
index 04255a3c..a2d709a1 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_1.3.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_2.0.1.bb
@@ -20,16 +20,22 @@ S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openvkl/openvkl.git;protocol=https;branch=master \
           "
-SRCREV = "ec551ea08cbceab187326e2358fdc1ceeffaf1d6"
+SRCREV = "8c6ba526813b871a624cb9d73d4cbb689ac7f4ce"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
-DEPENDS = "ispc-native rkcommon embree"
+DEPENDS = "ispc ispc-native rkcommon embree"
 EXTRA_OECMAKE += " \
                  -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc  \
                  "
+EXTRA_OECMAKE:intel-corei7-64 += " \
+                  -DOPENVKL_ISA_AVX=OFF  \
+                  -DOPENVKL_ISA_AVX2=OFF  \
+                  -DOPENVKL_ISA_AVX512SKX=OFF  \
+                  "
 PACKAGES =+ "${PN}-examples"
 FILES:${PN}-examples = "\
                     ${bindir} \
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.10.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb
index bd0d41d8..3e03dcc2 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.10.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_3.1.0.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://www.ospray.org/"
 LICENSE  = "Apache-2.0 & BSD-3-Clause & MIT & Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1dece7821bf3fd70fe1309eaa37d52a2 \
-                    file://third-party-programs.txt;md5=7cccb4c920e5b7de8eddf8a5d408d900 \
+                    file://third-party-programs.txt;md5=e37b77e3bd997abccc359c710fb1f1db \
                    "
 inherit pkgconfig cmake
@@ -15,17 +15,18 @@ S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/ospray/ospray.git;protocol=https;branch=master \
            "
-SRCREV = "fdda0889f9143a8b20f26389c22d1691f1a6a527"
+SRCREV = "f2a61c2eb58ccd666e34abfdb0fd7049ea073194"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
-DEPENDS = "rkcommon ispc-native openvkl embree"
+DEPENDS = "rkcommon ispc ispc-native openvkl embree"
 EXTRA_OECMAKE += " \
                  -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \
                  -DOSPRAY_ENABLE_APPS_BENCHMARK=OFF \
                  -DOSPRAY_ENABLE_APPS_TESTING=OFF \
+                  -DOSPRAY_ENABLE_APPS_EXAMPLES=OFF \
                  "
 PACKAGES =+ "${PN}-apps"
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.10.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb
index 8bf6d28b..fe6b23ea 100644
--- a/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.10.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-oneapi/rkcommon/rkcommon_1.13.0.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/ospray/rkcommon.git;protocol=https;branch=master \
            "
-SRCREV = "0b8856cd9278474b56dc5bcff516a4b9482cf147"
+SRCREV = "7ebfa0765ea590767202b328e7da38102c2f5a15"
 DEPENDS = "tbb"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
index 7fede93c..11305e83 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -1,48 +1,50 @@
+Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
+ builds
 Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
+---
 MdePkg/Include/Base.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
-index 2da08b0c78..072eefdb94 100644
+index d209e6de28..6e61b8f3d3 100644
 --- a/MdePkg/Include/Base.h
 +++ b/MdePkg/Include/Base.h
-@@ -318,7 +318,11 @@ struct _LIST_ENTRY {
+@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
- ///
+ #define NULL  __null
- /// NULL pointer (VOID *)
+   #endif
- ///
+ #else
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
 #define NULL  ((VOID *) 0)
+ #endif
 +#endif
 +#endif
- 
 //
 // Null character
-@@ -810,6 +814,8 @@ typedef UINTN  *BASE_LIST;
+@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST;
 // Section 2.3.1 of the UEFI 2.3 Specification.
 //
- 
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
 STATIC_ASSERT (sizeof (INT8)    == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
 STATIC_ASSERT (sizeof (UINT8)   == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
-@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specifi
+@@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specifi
 STATIC_ASSERT (sizeof (CHAR16)  == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");
 STATIC_ASSERT (sizeof (L'A')    == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements");
 STATIC_ASSERT (sizeof (L"A")    == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements");
 +#endif
 +#endif
- 
 //
 // The following three enum types are used to verify that the compiler
-@@ -843,9 +851,13 @@ typedef enum {
+@@ -812,9 +820,13 @@ typedef enum {
   __VerifyUint32EnumValue = 0xffffffff
 } __VERIFY_UINT32_ENUM_SIZE;
- 
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
@@ -50,8 +52,8 @@ index 2da08b0c78..072eefdb94 100644
 STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
 +#endif
 +#endif
- 
 /**
   Macro that returns a pointer to the data structure that contains a specified field of
-- 
+--
-2.31.0.windows.1
+2.37.3
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0468.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
index f38a64c3..c4743d1c 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0468.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb
@@ -15,15 +15,16 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71  \
                    file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
-SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \
+SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master;name=ipmctl; \
        git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \
        file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
        file://0001-CMakeLists-disable-Werror.patch \
 "
-SRCREV_ipmctl = "cd3bd60f84cb7167fa81257bd33db90fa1f5a70b"
+SRCREV_ipmctl = "c75bd840ea7820c8f93a5488fcff75d08beedd51"
-#tag edk2-stable202208
+#tag edk2-stable202302
-SRCREV_edk2 = "ba0e0e4c6a174b71b18ccd6e47319cc45878893c"
+SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3"
+SRCREV_FORMAT = "ipmctl_edk2"
 S = "${WORKDIR}/git"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch
deleted file mode 100644
index 2dde9880..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Use-system-installed-dependencies.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 86fc5a725883cf59086c319fca29ddb3e47fa7de Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 7 Apr 2022 21:39:26 +0800
-Subject: [PATCH 1/2] Use system installed dependencies
-Use the system versions of libva, ade and zlib.
-Upstream-Status: Inappropriate
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- cmake/dependencies.cmake              | 20 --------------------
- cmake/extra_modules.cmake             |  4 ++--
- src/plugins/intel_gpu/include/va/va.h |  6 ------
- tests/fuzz/src/CMakeLists.txt         |  3 +--
- thirdparty/CMakeLists.txt             | 25 +++++++++++--------------
- thirdparty/cnpy/CMakeLists.txt        |  2 +-
- 6 files changed, 15 insertions(+), 45 deletions(-)
- delete mode 100644 src/plugins/intel_gpu/include/va/va.h
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index 8d66a012b8..75db89b915 100644
--- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -27,26 +27,6 @@ get_linux_name(LINUX_OS_NAME)
- 
- if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
-     set(protoc_version "3.18.2")
-
-    RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
-        ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
-        TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
-        SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21"
-    )
-    debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
-
-    reset_deps_cache(SYSTEM_PROTOC)
-
-    find_host_program(
-        SYSTEM_PROTOC
-        NAMES protoc
-        PATHS "${SYSTEM_PROTOC_ROOT}/bin"
-        NO_DEFAULT_PATH)
-    if(NOT SYSTEM_PROTOC)
-        message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
-    endif()
-
-    update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
- endif()
- 
- if(ENABLE_INTEL_MYRIAD)
-diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake
-index 72eed6ad3a..39e9674a11 100644
--- a/cmake/extra_modules.cmake
-+++ b/cmake/extra_modules.cmake
-@@ -22,7 +22,7 @@ function(ie_generate_dev_package_config)
-     configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
-                                   "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
-                                   INSTALL_DESTINATION share # not used
-                                  PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
-+                                  PATH_VARS "OpenVINO_SOURCE_DIR"
-                                   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
-     configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
-@@ -53,7 +53,7 @@ function(ov_generate_dev_package_config)
-     configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in"
-                                   "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake"
-                                   INSTALL_DESTINATION share # not used
-                                  PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
-+                                  PATH_VARS "OpenVINO_SOURCE_DIR"
-                                   NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- 
-     configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in"
-diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
-deleted file mode 100644
-index 5c8a5c6f6e..0000000000
--- a/src/plugins/intel_gpu/include/va/va.h
-+++ /dev/null
-@@ -1,6 +0,0 @@
-// Copyright (C) 2018-2022 Intel Corporation
-// SPDX-License-Identifier: Apache-2.0
-//
-
-typedef cl_uint VASurfaceID;
-typedef void* VADisplay;
-diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt
-index 5e6b7b168e..a81c51bb77 100644
--- a/tests/fuzz/src/CMakeLists.txt
-+++ b/tests/fuzz/src/CMakeLists.txt
-@@ -10,14 +10,13 @@ add_custom_target(fuzz)
- FILE(GLOB tests "*-fuzzer.cc")
- 
- add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy)
-add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
- 
- foreach(test_source ${tests})
-     get_filename_component(test_name ${test_source} NAME_WE)
-     add_fuzzer(${test_name} ${test_source})
- 
-     target_link_libraries(${test_name} PRIVATE
-        openvino::runtime cnpy zlib)
-+        openvino::runtime cnpy z)
- 
-     add_dependencies(fuzz ${test_name})
- 
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 38b0a5439d..4cba1588fe 100644
--- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_subdirectory(ittapi)
- add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
- add_subdirectory(cnpy EXCLUDE_FROM_ALL)
- if(ENABLE_INTEL_GPU)
-    add_subdirectory(ocl)
-+       #add_subdirectory(ocl)
- endif()
- 
- add_subdirectory(xbyak EXCLUDE_FROM_ALL)
-@@ -72,12 +72,11 @@ endif()
- add_library(ocv_hal INTERFACE)
- target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv")
- 
-add_subdirectory(ade EXCLUDE_FROM_ALL)
- add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL)
-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
-+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
-+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
-+
- 
-ov_install_static_lib(ade openvino_common)
- ov_install_static_lib(fluid openvino_common)
- 
- #
-@@ -93,8 +92,6 @@ if(gflags_FOUND)
-     set_target_properties(gflags PROPERTIES IMPORTED_GLOBAL ON)
-     message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}")
- else()
-    add_subdirectory(gflags EXCLUDE_FROM_ALL)
-    openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
- endif()
- 
- #
-@@ -119,13 +116,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
-             set(Protobuf_DEBUG ON)
-         endif()
-         find_package(Protobuf 3.18.2 REQUIRED)
-        set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
-        set(Protobuf_LIBRARIES protobuf::libprotobuf)
-        set(SYSTEM_PROTOC protobuf::protoc)
-+       set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
-+       set(Protobuf_LIBRARIES protobuf::libprotobuf)
-+       #set(SYSTEM_PROTOC protobuf::protoc)
-         set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC})
- 
-         foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES})
-            set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
-+               #set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
-         endforeach()
-     else()
-         add_subdirectory(protobuf EXCLUDE_FROM_ALL)
-@@ -134,8 +131,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
-     # forward variables used in the other places
-     set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE)
-     set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE)
-    set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE)
-    set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE)
-+    set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE)
-+    set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE)
-     set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE)
-     set(Protobuf_IN_FRONTEND ON PARENT_SCOPE)
- 
-@@ -146,7 +143,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
-             set(link_type INTERFACE)
-         endif()
-         if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
-            target_compile_options(${target} ${link_type} -Wno-undef)
-+               #target_compile_options(${target} ${link_type} -Wno-undef)
-         endif()
-     endforeach()
- endif()
-diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
-index 556adb03c4..793de9845c 100644
--- a/thirdparty/cnpy/CMakeLists.txt
-+++ b/thirdparty/cnpy/CMakeLists.txt
-@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
-                                           PRIVATE -Wno-all)
- endif()
- 
-target_link_libraries(${TARGET_NAME} PUBLIC zlib::zlib)
-+target_link_libraries(${TARGET_NAME} PUBLIC z)
- target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
- 
- set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)
-- 
-2.37.3
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
new file mode 100644
index 00000000..7f5b46c6
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -0,0 +1,86 @@
+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] 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 try to write triggers for CPack. We package ourselves.
+* Fix the installation path for Python modules when baselib = lib64.
+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      | 4 ++--
+ samples/cpp/CMakeLists.txt                      | 6 +++---
+ src/bindings/python/CMakeLists.txt              | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
+index 99f11730983..1a1f61fcd3d 100644
+--- a/cmake/developer_package/packaging/rpm/rpm.cmake
+++ b/cmake/developer_package/packaging/rpm/rpm.cmake
+@@ -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")
+-file(WRITE "${def_triggers}" "${triggers_content}")
+#file(WRITE "${def_triggers}" "${triggers_content}")
+ 
+ #
+ # 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 d047a1aebd9..4e8ca68c60f 100644
+--- a/cmake/developer_package/target_flags.cmake
+++ b/cmake/developer_package/target_flags.cmake
+@@ -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 4d33bff944e..3e7f1458578 100644
+--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
+@@ -206,9 +206,9 @@ macro(ov_add_sample)
+     target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES})
+ 
+     install(TARGETS ${SAMPLE_NAME}
+-            RUNTIME DESTINATION samples_bin/
+-            COMPONENT samples_bin
+-            EXCLUDE_FROM_ALL)
+            DESTINATION ${CMAKE_INSTALL_BINDIR}
+            COMPONENT samples_bin)
+
+ 
+     # 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 6cf43ec3fed..d539b9d003f 100644
+--- a/src/bindings/python/CMakeLists.txt
+++ b/src/bindings/python/CMakeLists.txt
+@@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING)
+     # 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(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
+     set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO")
+ 
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch
deleted file mode 100644
index 12c8054e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Fix-installation-of-binaries-and-libraries.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-From 3d55027cd86db299faeed0a4a97ddcec1baedd61 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Mon, 11 Apr 2022 11:11:23 +0800
-Subject: [PATCH 2/2] Fix installation of binaries and libraries
-Make sure binaries are installed correctly.
-Upstream-Status: Inappropriate
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- CMakeLists.txt                                       |  2 +-
- cmake/developer_package/frontends/frontends.cmake    |  2 +-
- cmake/developer_package/packaging.cmake              |  4 ++--
- cmake/developer_package/plugins/plugins.cmake        |  2 +-
- docs/CMakeLists.txt                                  |  3 ++-
- samples/CMakeLists.txt                               |  2 +-
- samples/c/common/opencv_c_wrapper/CMakeLists.txt     |  2 ++
- samples/cpp/CMakeLists.txt                           |  2 ++
- scripts/CMakeLists.txt                               | 10 +++++-----
- src/bindings/c/src/CMakeLists.txt                    |  4 ++--
- src/cmake/openvino.cmake                             | 12 ++++++------
- src/common/preprocessing/CMakeLists.txt              |  2 +-
- src/core/CMakeLists.txt                              |  4 ++--
- src/inference/CMakeLists.txt                         |  2 +-
- .../intel_gpu/src/kernel_selector/CMakeLists.txt     |  2 +-
- src/plugins/intel_myriad/myriad_dependencies.cmake   |  2 +-
- .../intel_myriad/myriad_plugin/CMakeLists.txt        |  2 +-
- tools/CMakeLists.txt                                 |  2 +-
- tools/compile_tool/CMakeLists.txt                    |  8 ++++----
- 19 files changed, 37 insertions(+), 32 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f570d4246c..d20ac60749 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,7 +111,7 @@ include(cmake/extra_modules.cmake)
- add_subdirectory(docs)
- add_subdirectory(tools)
- add_subdirectory(scripts)
-add_subdirectory(licensing)
-+#add_subdirectory(licensing)
- 
- #
- # CPack
-diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
-index 0779ed286d..f80cb9bb79 100644
--- a/cmake/developer_package/frontends/frontends.cmake
-+++ b/cmake/developer_package/frontends/frontends.cmake
-@@ -2,7 +2,7 @@
- # SPDX-License-Identifier: Apache-2.0
- #
- 
-set(FRONTEND_INSTALL_INCLUDE "runtime/include/")
-+set(FRONTEND_INSTALL_INCLUDE "include/")
- set(FRONTEND_NAME_PREFIX "openvino_")
- set(FRONTEND_NAME_SUFFIX "_frontend")
- 
-diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
-index 458ddade93..626eb6548a 100644
--- a/cmake/developer_package/packaging.cmake
-+++ b/cmake/developer_package/packaging.cmake
-@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir)
-         set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
-     else()
-        set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
-        set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
-+        set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
-+        set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
-     endif()
- endfunction()
-diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
-index b748ebddef..fe670e88bc 100644
--- a/cmake/developer_package/plugins/plugins.cmake
-+++ b/cmake/developer_package/plugins/plugins.cmake
-@@ -139,7 +139,7 @@ function(ie_add_plugin)
- 
-             if(BUILD_SHARED_LIBS)
-                 install(TARGETS ${IE_PLUGIN_NAME}
-                        LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+                        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH}
-                         COMPONENT ${install_component})
-             else()
-                 ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component})
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 86b0e8652b..4f31d3cc4b 100644
--- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER)
-     foreach(target openvino_template_plugin template_extension openvino_template_extension)
-         if(TARGET ${target})
-             install(TARGETS ${target}
-                    LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+                   LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
-                     COMPONENT tests
-                     EXCLUDE_FROM_ALL)
-+            install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-         endif()
-     endforeach()
- endif()
-diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
-index 8101b5e328..6abe8c20ce 100644
--- a/samples/CMakeLists.txt
-+++ b/samples/CMakeLists.txt
-@@ -9,7 +9,7 @@ add_subdirectory(c)
- if(TARGET format_reader)
-     install(TARGETS format_reader
-             RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL
-            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
-+            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests)
- endif()
- 
- openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
-diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-index 2755579a0f..4a5f5b424f 100644
--- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
-@@ -34,3 +34,5 @@ install(
-     RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
-     LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index 3628c8283a..186540940f 100644
--- a/samples/cpp/CMakeLists.txt
-+++ b/samples/cpp/CMakeLists.txt
-@@ -258,6 +258,8 @@ macro(ie_add_sample)
-             COMPONENT samples_bin
-             EXCLUDE_FROM_ALL)
- 
-+    install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
-+
-     # create global target with all samples / demo apps
-     if(NOT TARGET ie_samples)
-         add_custom_target(ie_samples ALL)
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 4e9f76638f..6d8df5f0a1 100644
--- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -37,7 +37,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
- 
- # install setupvars
- 
-ie_cpack_add_component(setupvars REQUIRED)
-+#ie_cpack_add_component(setupvars REQUIRED)
- 
- if(UNIX)
-     set(_setupvars_file setupvars/setupvars.sh)
-@@ -54,13 +54,13 @@ elseif(WIN32)
-         file(WRITE "${_setupvars_file}" "${_setupvars_content}")
-     endif()
- endif()
-install(PROGRAMS "${_setupvars_file}"
-        DESTINATION .
-        COMPONENT setupvars)
-+#install(PROGRAMS "${_setupvars_file}"
-+#        DESTINATION .
-+#        COMPONENT setupvars)
- 
- # install install_dependencies
- 
-if(LINUX)
-+if (FALSE)
-     ie_cpack_add_component(install_dependencies REQUIRED)
-     install(DIRECTORY install_dependencies/
-             DESTINATION install_dependencies
-diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt
-index 9200d0bda1..b3636e0716 100644
--- a/src/bindings/c/src/CMakeLists.txt
-+++ b/src/bindings/c/src/CMakeLists.txt
-@@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c
-         ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c
-         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c
-        INCLUDES DESTINATION runtime/include/ie)
-+        INCLUDES DESTINATION include/ie)
- 
- install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/
-        DESTINATION runtime/include/ie
-+        DESTINATION include/ie
-         COMPONENT core_c_dev)
-diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake
-index 340896e3a8..9bda84fe51 100644
--- a/src/cmake/openvino.cmake
-+++ b/src/cmake/openvino.cmake
-@@ -62,8 +62,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
-         RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
-         ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
-         LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
-        INCLUDES DESTINATION runtime/include
-                             runtime/include/ie)
-+        INCLUDES DESTINATION include
-+                             include/ie)
- 
- #
- # Add openvin::dev target
-@@ -107,7 +107,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
- 
- if(BUILD_SHARED_LIBS)
-     install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
-            DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+            DESTINATION ${IE_CPACK_LIBRARY_PATH}
-             COMPONENT core)
- 
-     # for InferenceEngineUnitTest
-@@ -126,7 +126,7 @@ endif()
- install(EXPORT OpenVINOTargets
-         FILE OpenVINOTargets.cmake
-         NAMESPACE openvino::
-        DESTINATION runtime/cmake
-+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
-         COMPONENT core_dev)
- 
- set(PUBLIC_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/inference/include")
-@@ -167,10 +167,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
- 
- install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
-               "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
-        DESTINATION runtime/cmake
-+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
-         COMPONENT core_dev)
- 
- install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
-               "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake"
-        DESTINATION runtime/cmake
-+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
-         COMPONENT core_dev)
-diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt
-index e41e286c95..11aaffca6a 100644
--- a/src/common/preprocessing/CMakeLists.txt
-+++ b/src/common/preprocessing/CMakeLists.txt
-@@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
- 
- if(BUILD_SHARED_LIBS)
-     install(TARGETS ${TARGET_NAME}
-            LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
-+            LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
- else()
-     ov_install_static_lib(${TARGET_NAME} core)
- endif()
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 86b195ee1c..867121ee50 100644
--- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -127,7 +127,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_
- #-----------------------------------------------------------------------------------------------
- 
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
-        DESTINATION "runtime/include"
-+        DESTINATION "include"
-         COMPONENT core_dev
-         FILES_MATCHING
-             PATTERN "*.hpp"
-@@ -143,5 +143,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
- 
- install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake
-               ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
-        DESTINATION "runtime/cmake"
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-         COMPONENT core_dev)
-diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt
-index 737e7e0027..259d5e141d 100644
--- a/src/inference/CMakeLists.txt
-+++ b/src/inference/CMakeLists.txt
-@@ -209,7 +209,7 @@ set_target_properties(${TARGET_NAME}_obj
- 
- openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api)
- 
-install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include
-+install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include
-         COMPONENT core_dev)
- 
- # Install static libraries for case BUILD_SHARED_LIBS=OFF
-diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
-index 3993bd9731..99287bad51 100644
--- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
-+++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
-@@ -94,7 +94,7 @@ add_custom_command(
-     COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json)
- 
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json
-        DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+        DESTINATION ${IE_CPACK_LIBRARY_PATH}
-         COMPONENT gpu)
- 
- ov_install_static_lib(${TARGET_NAME} gpu)
-diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake
-index 480acc05d1..5849f55878 100644
--- a/src/plugins/intel_myriad/myriad_dependencies.cmake
-+++ b/src/plugins/intel_myriad/myriad_dependencies.cmake
-@@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
-         VERBATIM)
- 
-     install(FILES ${${var_name}}
-            DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+            DESTINATION ${IE_CPACK_LIBRARY_PATH}
-             COMPONENT myriad)
- 
-     if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS)
-diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
-index d8ebea0bfc..66b5a3d462 100644
--- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
-+++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
-@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
- 
- if(LINUX)
-     install(FILES ${mvnc_SOURCE_DIR}/src/97-myriad-usbboot.rules
-            DESTINATION install_dependencies
-+           DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
-             COMPONENT myriad)
- endif()
-diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
-index 2fe0fd9742..234110b7d4 100644
--- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -20,7 +20,7 @@ endif()
- ie_cpack_add_component(deployment_manager REQUIRED)
- 
- install(DIRECTORY deployment_manager
-        DESTINATION tools
-+        DESTINATION share/openvino/tools
-         COMPONENT deployment_manager
-         USE_SOURCE_PERMISSIONS)
- 
-diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt
-index d19eb5cc14..9fc929cbb0 100644
--- a/tools/compile_tool/CMakeLists.txt
-+++ b/tools/compile_tool/CMakeLists.txt
-@@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- ie_cpack_add_component(core_tools DEPENDS core)
- 
- install(TARGETS compile_tool
-        RUNTIME DESTINATION tools/compile_tool
-+        RUNTIME DESTINATION bin
-         COMPONENT core_tools)
- 
-install(FILES README.md
-        DESTINATION tools/compile_tool
-        COMPONENT core_tools)
-+#install(FILES README.md
-+#        DESTINATION tools/compile_tool
-+#        COMPONENT core_tools)
-- 
-2.37.3
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
new file mode 100644
index 00000000..8a1464d5
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
@@ -0,0 +1,33 @@
+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 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=]
+|  129 |     virtual JitDefinitions GetDefinitions() const = 0;
+|      |
+Upstream-Status: Pending
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ src/plugins/intel_gpu/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
+index 2f3d9127dde..2fd4f5c1b3c 100644
+--- a/src/plugins/intel_gpu/CMakeLists.txt
+++ b/src/plugins/intel_gpu/CMakeLists.txt
+@@ -47,7 +47,7 @@ add_subdirectory(thirdparty)
+ include(thirdparty/cmake/rapidjson.cmake)
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-    ov_add_compiler_flags(-Werror)
+       #ov_add_compiler_flags(-Werror)
+ endif()
+ 
+ add_subdirectory(src/runtime)
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch
deleted file mode 100644
index ffb0f95d..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Fix-build-issues-due-to-gflag-and-zlib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a817386f1d0539a040fbdc02853a73bbcdddf1f1 Mon Sep 17 00:00:00 2001
-From: Yogesh Tyagi <yogesh.tyagi@intel.com>
-Date: Fri, 30 Sep 2022 20:26:04 +0800
-Subject: [PATCH] Fix build issues due to gflag and zlib
-Change gflag to shared as we are not building with static library.
-We are using zlib from host, so don't add zlib as third party package
-Upstream-Status: Inappropriate
-Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
---
- thirdparty/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
-index 4cba1588fe..f82bf3148b 100644
--- a/thirdparty/CMakeLists.txt
-+++ b/thirdparty/CMakeLists.txt
-@@ -39,7 +39,7 @@ if(NOT CMAKE_CROSSCOMPILING)
- endif()
- 
- if(NOT zlib_FOUND)
-    add_subdirectory(zlib EXCLUDE_FROM_ALL)
-+       #add_subdirectory(zlib EXCLUDE_FROM_ALL)
- endif()
- 
- #
-@@ -85,7 +85,7 @@ ov_install_static_lib(fluid openvino_common)
- 
- if(NOT APPLE)
-     # on Apple only dynamic libraries are available
-    find_package(gflags QUIET COMPONENTS nothreads_static)
-+    find_package(gflags QUIET COMPONENTS nothreads_shared)
- endif()
- 
- if(gflags_FOUND)
-- 
-2.37.3
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-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
new file mode 100644
index 00000000..bbdeaa2a
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
@@ -0,0 +1,45 @@
+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 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.
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cmake/developer_package/frontends/frontends.cmake | 2 +-
+ thirdparty/protobuf/CMakeLists.txt                | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
+index f3b5520d6d2..7579f638c5a 100644
+--- a/cmake/developer_package/frontends/frontends.cmake
+++ b/cmake/developer_package/frontends/frontends.cmake
+@@ -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}"
+-                COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
+                COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file}
+                 DEPENDS ${PROTOC_DEPENDENCY} ${proto_file}
+                 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 15f32601f23..36853caf7dc 100644
+--- a/thirdparty/protobuf/CMakeLists.txt
+++ b/thirdparty/protobuf/CMakeLists.txt
+@@ -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))))
+-    set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE)
+    set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ else()
+     set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE)
+ endif()
+-- 
+2.34.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch
deleted file mode 100644
index 45ed0d27..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Change the working directory to source to workaround cython
-embedding absolute path to the pyx file in output.
-Upstream-Status: Inappropriate [OE build specific]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-diff --git a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
-index f14662ad50..8d199fe328 100644
--- a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
-+++ b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
-@@ -259,7 +259,7 @@ function( compile_pyx _name generated_file )
-   add_custom_command( OUTPUT ${_generated_file}
-     COMMAND ${CYTHON_EXECUTABLE}
-     ARGS ${cxx_arg} ${include_directory_arg} ${version_arg}
-    ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS}
-+    ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} -w ${CMAKE_CURRENT_SOURCE_DIR}
-     --output-file  ${_generated_file} ${pyx_locations}
-     DEPENDS ${pyx_locations} ${pxd_dependencies} ${pxi_dependencies}
-     IMPLICIT_DEPENDS ${pyx_lang} ${c_header_dependencies}
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
index 2b608050..816a98a3 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
@@ -1,4 +1,4 @@
-From fe3e1d923399da1d71458f5c468563b61784380c Mon Sep 17 00:00:00 2001
+From 804b08023b3f8e72b8e3eb09e464d6775c11d966 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Fri, 21 Oct 2022 11:38:23 +0800
 Subject: [PATCH] demos: use gflags from meta-oe
@@ -7,23 +7,21 @@ Upstream-Status: Inappropriate
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
 demos/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
-index 1484a50d5..996934310 100644
+index 51767051c..fb7e3d22f 100644
 --- a/demos/CMakeLists.txt
 +++ b/demos/CMakeLists.txt
-@@ -140,7 +140,7 @@ endmacro()
+@@ -141,7 +141,7 @@ endmacro()
 find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs)
 find_package(OpenVINO REQUIRED COMPONENTS Runtime)
 
 -add_subdirectory(thirdparty/gflags)
 +#add_subdirectory(thirdparty/gflags)
 add_subdirectory(common/cpp)
- # TODO: remove wrapping if after OpenCV3 is dropped
+ 
- if(OpenCV_VERSION VERSION_GREATER_EQUAL 4.5.3)
+ find_package(OpenCV QUIET COMPONENTS gapi)
-- 
-2.25.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
index fc56ba69..a9422e70 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.2.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.1.0.bb
@@ -4,11 +4,11 @@ DESCRIPTION = "This repository includes optimized deep learning \
 models and a set of demos to expedite development of high-performance \
 deep learning inference applications."
-SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=releases/2022/2 \
+SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=master \
           file://0001-use-oe-gflags.patch \
           "
-SRCREV = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79"
+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_2022.2.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb
deleted file mode 100644
index 2853100e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.2.0.bb
+++ /dev/null
@@ -1,144 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
-HOMEPAGE = "https://github.com/opencv/dldt"
-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;branch=releases/2022/2;lfs=0 \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_20220307_34.zip;name=usb_ma2x8x \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_20220307_34.zip;name=pcie_ma2x8x \
-           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 \
-           git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \
-           git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \
-           git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=main \
-           git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/2 \
-           file://0001-Use-system-installed-dependencies.patch \
-           file://0002-Fix-installation-of-binaries-and-libraries.patch \
-           file://0003-Fix-build-issues-due-to-gflag-and-zlib.patch \
-           file://cython-cmake.patch \
-           "
-SRCREV = "af16ea1d79a494503a54cff67a2856094e447931"
-SRCREV_mkl = "2a749c577f8a841a396d4bd46eaf311b7e7dc089"
-SRCREV_onednn = "efbf9b5e8c12666314f3484ce279cee0a1a91a44"
-SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
-SRCREV_pybind11 = "aa304c9c7d725ffb9d10af08a3b34cb372307020"
-SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c"
-SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1"
-SRCREV_omz = "1919ae9d42c19d8f3bafc2417256ab3a67b6db79"
-SRC_URI[usb_ma2x8x.sha256sum] = "877c4e1616d14a94dd2764f4f32f1c1aa2180dcd64ad1823b31efdc3f56ad593"
-SRC_URI[pcie_ma2x8x.sha256sum] = "aabff3d817431792ef9e17056448979c2cdbb484ad4b0af9e68cb874ee10eef5"
-LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
-                    file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
-                    file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \
-                    file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \
-                    file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
-                    file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
-                    file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \
-"
-inherit cmake python3native
-S = "${WORKDIR}/git"
-EXTRA_OECMAKE += " \
-                  -DENABLE_OPENCV=OFF \
-                  -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \
-                  -DENABLE_PLUGIN_RPATH=0 \
-                  -DENABLE_INTEL_GNA=OFF \
-                  -DENABLE_SYSTEM_TBB=ON \
-                  -DPYTHON_EXECUTABLE=${PYTHON} \
-                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
-                  -DENABLE_SAMPLES=ON \
-                  -DTREAT_WARNING_AS_ERROR=FALSE \
-                  -DENABLE_DATA=FALSE \
-                  -DENABLE_SYSTEM_PUGIXML=TRUE \
-                  -DENABLE_SYSTEM_PROTOBUF=TRUE \
-                  -DProtobuf_LIBRARIES=protobuf \
-                  -DProtobuf_LITE_LIBRARIES=protobuf-lite \
-                  -DProtobuf_INCLUDE_DIR=${STAGING_INCDIR} \
-                  -DSYSTEM_PROTOC=${STAGING_BINDIR_NATIVE}/protoc \
-                  -DENABLE_OV_ONNX_FRONTEND=FALSE \
-                  -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
-                  "
-DEPENDS += "libusb1 \
-            ade \
-            opencv \
-            pugixml \
-            protobuf \
-            protobuf-native \
-            tbb \
-            zlib \
-            "
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST:libc-musl = "null"
-PACKAGECONFIG ?= "vpu opencl"
-PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva,"
-PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
-PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware"
-PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
-do_configure:prepend() {
-    # Dont set PROJECT_ROOT_DIR
-    sed -i -e 's:\${CMAKE_CURRENT_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
-}
-do_install:append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
-        install -d ${D}${datadir}/openvino
-        mv ${D}/usr/samples/python ${D}${datadir}/openvino/
-        install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-        mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
-        mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/
-        rm -rf ${D}${prefix}/python
-    fi
-    rm -rf ${D}${prefix}/deployment_tools
-    # Remove the samples source directory. We install the built samples.
-    rm -rf ${D}/usr/samples
-    sed -i -e 's:^#include.*imp.hpp"$:#include "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/git/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp":g;' ${B}/src/plugins/intel_cpu/cross-compiled/proposal_imp_disp.cpp
-}
-# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
-# instead of RSS
-SSTATE_SCAN_FILES:append = " *.cmake"
-FILES:${PN}-dev = "${includedir} \
-                   ${libdir}/cmake \
-                   "
-FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \
-                ${datadir}/openvino \
-                ${libdir}/custom_kernels \
-                ${libdir}/plugins.xml \
-                ${libdir}/cache.json \
-                "
-# Move inference engine samples into a separate package
-PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
-FILES:${PN}-samples = "${datadir}/openvino \
-                       ${bindir} \
-                       "
-FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd"
-# Package for inference engine python API
-PACKAGES =+ "${PN}-${PYTHON_PN}"
-FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
new file mode 100644
index 00000000..675d9920
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.1.0.bb
@@ -0,0 +1,146 @@
+SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
+HOMEPAGE = "https://github.com/opencv/dldt"
+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/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 \
+           git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \
+           git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \
+           git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \
+           git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \
+           git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \
+           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://0002-cmake-Fix-overloaded-virtual-error.patch \
+           file://0003-protobuf-allow-target-protoc-to-be-built.patch \
+           "
+SRCREV_openvino = "f4afc983258bcb2592d999ed6700043fdb58ad78"
+SRCREV_mkl = "26633ae49edd4353a29b7170d9fcef6b2d79f4b3"
+SRCREV_onednn = "4e6ff043c439652fcf6c400ac4e0c81bbac7c71c"
+SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2"
+SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e"
+SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e"
+SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
+SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851"
+SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94"
+SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488"
+SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d"
+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 \
+                    file://thirdparty/xbyak/COPYRIGHT;md5=3c98edfaa50a86eeaef4c6109e803f16 \
+                    file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
+                    file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588 \
+                    file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+                    file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \
+                    file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \
+                    file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \
+                    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
+S = "${WORKDIR}/git"
+EXTRA_OECMAKE += " \
+                  -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                  -DENABLE_OPENCV=OFF \
+                  -DENABLE_INTEL_GNA=OFF \
+                  -DENABLE_SYSTEM_TBB=ON \
+                  -DPYTHON_EXECUTABLE=${PYTHON} \
+                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                  -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
+                  -DTREAT_WARNING_AS_ERROR=FALSE \
+                  -DENABLE_DATA=FALSE \
+                  -DENABLE_SYSTEM_PUGIXML=TRUE \
+                  -DENABLE_OV_ONNX_FRONTEND=FALSE \
+                  -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
+                  -DENABLE_FUZZING=OFF \
+                  -DENABLE_TBBBIND_2_5=OFF \
+                  -DCPACK_GENERATOR=RPM \
+                  -DENABLE_SYSTEM_FLATBUFFERS=ON \
+                  -DENABLE_SYSTEM_SNAPPY=ON \
+                  -DFETCHCONTENT_BASE_DIR="${S}" \
+                  -DENABLE_INTEL_NPU=OFF \
+                  "
+DEPENDS += "\
+            flatbuffers-native \
+            pugixml \
+            python3-pybind11 \
+            python3-pybind11-native \
+            qemu-native \
+            snappy \
+            tbb \
+            "
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST:libc-musl = "null"
+PACKAGECONFIG ?= "opencl samples"
+PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp,"
+PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress"
+PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv"
+PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
+do_configure:prepend() {
+    # Dont set PROJECT_ROOT_DIR
+    sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
+    # qemu wrapper that can be used by cmake to run target binaries.
+    qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
+    cat > ${WORKDIR}/qemuwrapper << EOF
+#!/bin/sh
+$qemu_binary "\$@"
+EOF
+    chmod +x ${WORKDIR}/qemuwrapper
+}
+do_install:append() {
+    rm -rf ${D}${prefix}/install_dependencies
+    rm -rf ${D}${prefix}/setupvars.sh
+    find ${B}/src/plugins/intel_cpu/cross-compiled/ -type f -name *_disp.cpp -exec sed -i -e 's%'"${S}"'%'"${TARGET_DBGSRC_DIR}"'%g' {} +
+}
+# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
+# instead of RSS
+SSTATE_SCAN_FILES:append = " *.cmake"
+FILES:${PN} += "\
+                ${libdir}/openvino-${PV}/lib*${SOLIBSDEV} \
+                ${libdir}/openvino-${PV}/plugins.xml \
+                ${libdir}/openvino-${PV}/cache.json \
+                "
+# Move inference engine samples into a separate package
+PACKAGES =+ "${PN}-samples"
+FILES:${PN}-samples = "${datadir}/openvino \
+                       ${bindir} \
+                       ${libdir}/libformat_reader.a \
+                       ${libdir}/libopencv_c_wrapper.a \
+                       "
+RDEPENDS:${PN}-samples += "python3-core"
+# Package for inference engine python API
+PACKAGES =+ "${PN}-python3"
+FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+\.\d+\.\d+))$"