23 files changed, 701 insertions, 52 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/files/113cef897712c8b475f668f2bcf77a12db76a90e.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/files/113cef897712c8b475f668f2bcf77a12db76a90e.patch
new file mode 100644
index 00000000..5edb52d0
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/files/113cef897712c8b475f668f2bcf77a12db76a90e.patch
@@ -0,0 +1,45 @@
+From a72b1fe0c571c191d857297114e0393ce017b7ab Mon Sep 17 00:00:00 2001
+From: Mateusz Jablonski <mateusz.jablonski@intel.com>
+Date: Wed, 28 Jul 2021 09:25:56 +0000
+Subject: [PATCH] Add missing includes
+
+Signed-off-by: Florian Minnecker <florian.github@minnecker.com>
+Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
+
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ shared/source/helpers/basic_math.h                   | 3 ++-
+ shared/source/helpers/registered_method_dispatcher.h | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/shared/source/helpers/basic_math.h b/shared/source/helpers/basic_math.h
+index fd62b9e6b..f339677eb 100644
+--- a/shared/source/helpers/basic_math.h
++++ b/shared/source/helpers/basic_math.h
+@@ -11,8 +11,9 @@
+ #include <algorithm>
+ #include <cmath>
+ #include <cstdint>
++#include <cstdio>
+ #include <cstdlib>
+-#include <stdio.h>
++#include <limits>
+ 
+ #define KB 1024uLL
+ #define MB (KB * KB)
+diff --git a/shared/source/helpers/registered_method_dispatcher.h b/shared/source/helpers/registered_method_dispatcher.h
+index 56f880a16..cd778fad0 100644
+--- a/shared/source/helpers/registered_method_dispatcher.h
++++ b/shared/source/helpers/registered_method_dispatcher.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstddef>
+ #include <cstdint>
+ #include <functional>
+ 
+-- 
+2.37.3
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb
index 5525b66a..eb17b642 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.15.16524.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae27f47fd6755510247c19e547e4c804 \
                     file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
 
 SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \
+           file://113cef897712c8b475f668f2bcf77a12db76a90e.patch \
            "
 
 SRCREV = "e0633548a9bd025c70bc7f3539eef094b1bc9ce1"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch
new file mode 100644
index 00000000..0a4a0fd9
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch
@@ -0,0 +1,26 @@
+From a36a4788a52128e5ccbec4cd29eb167153dcc8b8 Mon Sep 17 00:00:00 2001
+From: Diana Chen <po-yu.chen@intel.com>
+Date: Mon, 11 Jan 2021 19:06:36 +0000
+Subject: [PATCH] IGA: Add missing header
+
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ visa/iga/IGALibrary/IR/SWSBSetter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.cpp b/visa/iga/IGALibrary/IR/SWSBSetter.cpp
+index 87f119f3b..6956edf0d 100644
+--- a/visa/iga/IGALibrary/IR/SWSBSetter.cpp
++++ b/visa/iga/IGALibrary/IR/SWSBSetter.cpp
+@@ -27,6 +27,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "Traversals.hpp"
+ #include "BitSet.hpp"
+ #include <iterator>
++#include <limits>
+ using namespace iga;
+ 
+ /**
+-- 
+2.37.3
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
new file mode 100644
index 00000000..68131584
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
@@ -0,0 +1,27 @@
+From 79a95322fc5ae21c3380f6455b28b931c98b2d13 Mon Sep 17 00:00:00 2001
+From: Marcin Naczk <marcin.naczk@intel.com>
+Date: Tue, 22 Feb 2022 13:09:54 +0000
+Subject: [PATCH] Upgrade github Action build IGC
+
+- Fix build IGC on Ubuntu 22.04 by adding missing include
+
+Upstream-Status: Backport
+Part of: https://github.com/intel/intel-graphics-compiler/commit/4369c970d4e02258b3c53e854faaa34197124a33
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+---
+ visa/iga/IGALibrary/IR/SWSBSetter.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.hpp b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
+index 5a7ad75c0..02d52add2 100644
+--- a/visa/iga/IGALibrary/IR/SWSBSetter.hpp
++++ b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
+@@ -32,6 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "Operand.hpp"
+ #include "../ErrorHandler.hpp"
+ #include "RegDeps.hpp"
++#include <limits>
+ 
+ namespace iga
+ {
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch
new file mode 100644
index 00000000..b88e9678
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch
@@ -0,0 +1,46 @@
+From a58dd6de4c29595a0f93cff167b487d777e4559e Mon Sep 17 00:00:00 2001
+From: "Szymichowski, Pawel" <pawel.szymichowski@intel.com>
+Date: Wed, 8 Apr 2020 08:24:05 -0700
+Subject: [PATCH] Changes in code.
+
+Change-Id: Ica75407e834f6b3439912bd0b47a6b30a6521fc7
+
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ visa/iga/IGALibrary/api/igax.hpp | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/visa/iga/IGALibrary/api/igax.hpp b/visa/iga/IGALibrary/api/igax.hpp
+index 4f1c680c6a9..6d17cd99b6a 100644
+--- a/visa/iga/IGALibrary/api/igax.hpp
++++ b/visa/iga/IGALibrary/api/igax.hpp
+@@ -492,16 +492,19 @@ inline iga::Op OpSpec::op() const
+ }
+ 
+ 
+-#define IGA_OPSPEC_STRING_GETTER(API, INITSIZE) { \
+-        char _staticBuf[INITSIZE]; \
+-        char *strPtr = &_staticBuf[0]; \
+-        size_t strCap = sizeof(_staticBuf); \
+-        IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \
+-        if (strCap > sizeof(_staticBuf)) { \
+-            strPtr = (char *)alloca(strCap); \
++#define IGA_OPSPEC_STRING_GETTER(API, INITSIZE) {         \
++        char _staticBuf[INITSIZE];                        \
++        char *strPtr = &_staticBuf[0];                    \
++        size_t strCap = sizeof(_staticBuf);               \
++        IGA_CHECKED_CALL(API, m_op, strPtr, &strCap);     \
++        if (strCap > sizeof(_staticBuf)) {                \
++            strPtr = (char *)malloc(strCap);              \
+             IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \
+-        } \
+-        return std::string(strPtr); \
++            std::string res(strPtr);                      \
++            free(strPtr);                                 \
++            return res;                                   \
++        }                                                 \
++        return std::string(strPtr);                       \
+     }
+ inline std::string OpSpec::menmonic() const
+ IGA_OPSPEC_STRING_GETTER(iga_opspec_mnemonic, 16);
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
new file mode 100644
index 00000000..6efd51bc
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
@@ -0,0 +1,26 @@
+From 59d5ba1517c48a9e629994917a6e90207df26b08 Mon Sep 17 00:00:00 2001
+From: Bruno Pagani <bruno.n.pagani@gmail.com>
+Date: Mon, 21 Feb 2022 12:32:25 +0000
+Subject: [PATCH] Fix missing include
+
+Same as 6c805b2
+
+Upstream-Status: Backport
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+
+---
+ visa/LocalScheduler/SWSB_G4IR.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/visa/LocalScheduler/SWSB_G4IR.cpp b/visa/LocalScheduler/SWSB_G4IR.cpp
+index 0ef7961a0..bb631117d 100644
+--- a/visa/LocalScheduler/SWSB_G4IR.cpp
++++ b/visa/LocalScheduler/SWSB_G4IR.cpp
+@@ -26,6 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include <fstream>
+ #include <functional>
++#include <limits>
+ #include <sstream>
+ #include "SWSB_G4IR.h"
+ #include "../G4_Opcode.h"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb
index 6cfa0b6d..5474f8a7 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb
@@ -9,6 +9,10 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
 
 SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \
            file://0001-skip-execution-of-ElfPackager.patch \
+           file://a58dd6de4c29595a0f93cff167b487d777e4559e.patch \
+           file://0001-IGA-Add-missing-header.patch \
+           file://4369c970d4e02258b3c53e854faaa34197124a33.patch \
+           file://fix-header.patch \
           "
 
 SRCREV = "577887bf74c51a6084058836720fe58f8c35ca58"
diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb
index 26068acc..feeb036b 100644
--- a/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb
+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/dldt-model-optimizer_2020r1.bb
@@ -5,7 +5,7 @@ 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/opencv/dldt.git;protocol=git;branch=2020 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;lfs=0 \
            "
 SRCREV = "b2140c083a068a63591e8c2e9b5f6b240790519d"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb
index d5793500..bdd5aafc 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2011.0.0.0.bb
@@ -10,7 +10,7 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 COMPATIBLE_HOST_libc-musl = "null"
 
-inherit cmake systemd
+inherit cmake systemd features_check
 
 DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native connman"
 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb
index 42d223c9..a0244227 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2020r1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
 deep learning models through a high-level C++ Inference Engine API \
 integrated with application logic."
 
-SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2020 \
+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;lfs=0 \
            https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2450_942_R10.15.zip;name=ma2450 \
            https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_pcie-ma248x_942_R10.15.zip;name=ma248x \
            https://download.01.org/opencv/2020/openvinotoolkit/2020.1/inference_engine/firmware_usb-ma2x8x_942_R10.15.zip;name=ma2x8x \
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
index c4c7bd01..d77380d2 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
@@ -1,4 +1,4 @@
-From 1c78ff3ff1f77c78a618f7a780985cef1933bb2b Mon Sep 17 00:00:00 2001
+From 10dfcd0fb5c0f8d79981f59c9c363311143f640b Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Mon, 13 Apr 2020 15:20:28 +0800
 Subject: [PATCH] Installation and build fixes
@@ -30,13 +30,14 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  .../clDNN/CMakeCompilerLinkerOpts.txt           |  2 --
  .../thirdparty/clDNN/CMakeLists.txt             |  1 -
  .../clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp  |  2 +-
+ .../thirdparty/clDNN/src/CMakeLists.txt         |  4 ++--
  .../tools/compile_tool/CMakeLists.txt           |  2 +-
  .../tools/vpu/vpu_compile/CMakeLists.txt        |  4 ++--
  .../tools/vpu/vpu_perfcheck/CMakeLists.txt      |  2 +-
- 20 files changed, 28 insertions(+), 53 deletions(-)
+ 21 files changed, 30 insertions(+), 55 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e48cee57..e9598455 100644
+index e48cee574a7..e9598455971 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -120,8 +120,6 @@ function(build_ngraph)
@@ -49,7 +50,7 @@ index e48cee57..e9598455 100644
  
  build_ngraph()
 diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
-index e59edb2b..35672cac 100644
+index e59edb2b9c4..35672cac7e1 100644
 --- a/cmake/developer_package.cmake
 +++ b/cmake/developer_package.cmake
 @@ -5,7 +5,9 @@
@@ -82,7 +83,7 @@ index e59edb2b..35672cac 100644
  # Enable postfixes for Debug/Release builds
  set(IE_DEBUG_POSTFIX_WIN "d")
 diff --git a/cmake/os_flags.cmake b/cmake/os_flags.cmake
-index 6f70768f..40141aca 100644
+index 6f70768f9f1..40141aca8ad 100644
 --- a/cmake/os_flags.cmake
 +++ b/cmake/os_flags.cmake
 @@ -139,7 +139,6 @@ if(WIN32)
@@ -94,7 +95,7 @@ index 6f70768f..40141aca 100644
      ie_add_compiler_flags(-fvisibility=hidden)
      ie_add_compiler_flags(-fdiagnostics-show-option)
 diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
-index d5feedb4..1ee656a1 100644
+index d5feedb498d..1ee656a18e1 100644
 --- a/inference-engine/CMakeLists.txt
 +++ b/inference-engine/CMakeLists.txt
 @@ -123,12 +123,13 @@ install(FILES samples/CMakeLists.txt
@@ -124,7 +125,7 @@ index d5feedb4..1ee656a1 100644
         APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
  
 diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
-index 9ea885be..71733fd9 100644
+index 9ea885be37a..71733fd9d32 100644
 --- a/inference-engine/cmake/ie_parallel.cmake
 +++ b/inference-engine/cmake/ie_parallel.cmake
 @@ -42,14 +42,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
@@ -145,7 +146,7 @@ index 9ea885be..71733fd9 100644
          if (WIN32)
              set(omp_lib_name libiomp5md)
 diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
-index fce7d8f1..827e5764 100644
+index fce7d8f1784..827e5764aa7 100644
 --- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
 +++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
 @@ -21,4 +21,4 @@
@@ -155,7 +156,7 @@ index fce7d8f1..827e5764 100644
 -#include <CL/cl2.hpp>
 +#include <cl2.hpp>
 diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index f355e7b9..d24c7c78 100644
+index f355e7b951c..d24c7c78e6f 100644
 --- a/inference-engine/samples/CMakeLists.txt
 +++ b/inference-engine/samples/CMakeLists.txt
 @@ -24,7 +24,7 @@ endif()
@@ -188,7 +189,7 @@ index f355e7b9..d24c7c78 100644
  
  # collect all samples subdirectories
 diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
-index 6d935135..fe12eeb7 100644
+index 6d935135e9d..fe12eeb7193 100644
 --- a/inference-engine/samples/common/format_reader/CMakeLists.txt
 +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
 @@ -40,3 +40,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -198,7 +199,7 @@ index 6d935135..fe12eeb7 100644
 +
 +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
-index 43344e7f..50beda23 100644
+index 43344e7ff07..50beda23415 100644
 --- a/inference-engine/src/cldnn_engine/CMakeLists.txt
 +++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
 @@ -32,6 +32,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
@@ -210,7 +211,7 @@ index 43344e7f..50beda23 100644
  
  # copy default global xml file describing the custom kernels and the *.cl files
 diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index 54e264c8..e3809654 100644
+index 54e264c824c..e3809654635 100644
 --- a/inference-engine/src/inference_engine/CMakeLists.txt
 +++ b/inference-engine/src/inference_engine/CMakeLists.txt
 @@ -292,20 +292,6 @@ if(threading_tbb)
@@ -247,7 +248,7 @@ index 54e264c8..e3809654 100644
  install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
          DESTINATION ${IE_CPACK_LIBRARY_PATH}
 diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-index 32cb534a..858ffefc 100644
+index 32cb534a79e..858ffefcf8e 100644
 --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
 +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
 @@ -41,5 +41,5 @@ target_link_libraries(${TARGET_NAME}
@@ -258,7 +259,7 @@ index 32cb534a..858ffefc 100644
 +        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
          COMPONENT myriad)
 diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt
-index f3fb53e1..09fb66ce 100644
+index f3fb53e1d29..09fb66cea57 100644
 --- a/inference-engine/tests/mock_engine/CMakeLists.txt
 +++ b/inference-engine/tests/mock_engine/CMakeLists.txt
 @@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLU
@@ -268,7 +269,7 @@ index f3fb53e1..09fb66ce 100644
 +
 +install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
-index a5c945ae..eabe70d3 100644
+index a5c945ae819..eabe70d3e7b 100644
 --- a/inference-engine/tests/unit/CMakeLists.txt
 +++ b/inference-engine/tests/unit/CMakeLists.txt
 @@ -187,3 +187,5 @@ add_test(NAME ${TARGET_NAME}
@@ -278,7 +279,7 @@ index a5c945ae..eabe70d3 100644
 +
 +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
-index ec22761d..3962d924 100644
+index ec22761d0d5..3962d924fe2 100644
 --- a/inference-engine/thirdparty/CMakeLists.txt
 +++ b/inference-engine/thirdparty/CMakeLists.txt
 @@ -35,14 +35,12 @@ function(build_with_lto)
@@ -298,7 +299,7 @@ index ec22761d..3962d924 100644
          ie_developer_export_targets(pugixml_mt)
      endif()
 diff --git a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
-index 6b799cdd..91755b35 100644
+index 6b799cdd38f..91755b351e8 100644
 --- a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
 +++ b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
 @@ -206,7 +206,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
@@ -318,7 +319,7 @@ index 6b799cdd..91755b35 100644
        ALIAS WarnLevel1                 WarnLevels REMOVE_GROUP
        ALIAS WarnLevel2                 "-Wall"
 diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-index b08c2744..42ca79e6 100644
+index b08c27444a9..42ca79e677c 100644
 --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
 +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
 @@ -767,7 +767,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
@@ -330,7 +331,7 @@ index b08c2744..42ca79e6 100644
          NoFastMath
          StackProtector
 diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
-index a9e379bd..8b822223 100644
+index a9e379bdee6..8b822223681 100644
 --- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
 +++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
 @@ -30,7 +30,7 @@ typedef cl_d3d11_device_set_khr    cl_device_set_intel;
@@ -342,8 +343,23 @@ index a9e379bd..8b822223 100644
  
  namespace cl {
      typedef CL_API_ENTRY cl_int(CL_API_CALL *PFN_clEnqueueAcquireMediaSurfacesINTEL)(
+diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
+index 99e947eeb83..5ce0fc5086a 100644
+--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
++++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
+@@ -213,8 +213,8 @@ install(DIRECTORY "${CLDNN__API_DIR}/"
+   )
+ # Binaries.
+ install(TARGETS "${CLDNN_BUILD__PROJ}"
+-    ARCHIVE DESTINATION "lib"
+-    LIBRARY DESTINATION "lib"
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION "bin"
+     INCLUDES DESTINATION "include/clDNN"
+   )
 diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
-index 25168bac..1c57116f 100644
+index 25168bacf58..1c57116ff04 100644
 --- a/inference-engine/tools/compile_tool/CMakeLists.txt
 +++ b/inference-engine/tools/compile_tool/CMakeLists.txt
 @@ -48,5 +48,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -354,7 +370,7 @@ index 25168bac..1c57116f 100644
 +        RUNTIME DESTINATION bin
          COMPONENT core)
 diff --git a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
-index 4123de6f..52179fac 100644
+index 4123de6fda9..52179facafe 100644
 --- a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
 +++ b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
 @@ -50,5 +50,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -367,7 +383,7 @@ index 4123de6f..52179fac 100644
 +        RUNTIME DESTINATION bin
 +        COMPONENT myriad)
 diff --git a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
-index a7a801d4..b8f9e26f 100644
+index a7a801d4e41..b8f9e26f309 100644
 --- a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
 +++ b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
 @@ -55,6 +55,6 @@ if(ENABLE_MYRIAD)
@@ -379,5 +395,5 @@ index a7a801d4..b8f9e26f 100644
              COMPONENT myriad)
  endif()
 -- 
-2.25.2
+2.37.3
 
diff --git a/lib/oeqa/runtime/cases/microcode.py b/lib/oeqa/runtime/cases/microcode.py
index 6ce36a6f..52c1cdb4 100644
--- a/lib/oeqa/runtime/cases/microcode.py
+++ b/lib/oeqa/runtime/cases/microcode.py
@@ -16,20 +16,15 @@ class MicrocodeTest(OERuntimeTestCase):
 
     @OEHasPackage(["iucode-tool"])
     def test_microcode_update(self):
-        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -lS | grep rev')
-        if status:
-            self.skipTest("The iucode_tool detected no microcode for update.")
+        (status, output) = self.target.run('iucode_tool /lib/firmware/intel-ucode/ -tb -l --scan-system=2 | grep rev')
 
         selected_microcodes = output.splitlines()
         selected_rev_list = self.get_revision_from_microcode_string_list(selected_microcodes, "rev (\w*)")
-        self.assertTrue(selected_rev_list, msg="Could not find any rev from iucode_tool selected microcode.")
 
-        (status, output) = self.target.run('dmesg | grep microcode')
-        self.assertEqual(status, 0, msg='status and output: %s and %s' % (status, output))
+        (status, output) = self.target.run("dmesg | grep 'microcode updated early'")
 
         updated_microcodes = output.splitlines()
-        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision=(\w*)")
-        self.assertTrue(updated_rev_list, msg="Could not find any updated revision from microcode dmesg.")
+        updated_rev_list = self.get_revision_from_microcode_string_list(updated_microcodes, "revision (\w*)")
 
         for ul in updated_rev_list:
             self.assertTrue(ul in selected_rev_list, msg="Updated revision, %s, not in selected revision list (%s)" %
diff --git a/recipes-core/microcode/intel-microcode_20201118.bb b/recipes-core/microcode/intel-microcode_20240312.bb
index b47c8157..483be730 100644
--- a/recipes-core/microcode/intel-microcode_20201118.bb
+++ b/recipes-core/microcode/intel-microcode_20240312.bb
@@ -11,12 +11,12 @@ DESCRIPTION = "The microcode data file contains the latest microcode\
  if the file is placed in the /etc/firmware directory of the Linux system."
 
 LICENSE = "Intel-Microcode-License"
-LIC_FILES_CHKSUM = "file://license;md5=6b58767419df274d2409b294ddae17e6"
+LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721"
 
 SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \
            "
 
-SRCREV = "49bb67f32a2e3e631ba1a9a73da1c52e1cac7fd9"
+SRCREV = "41af34500598418150aa298bb04e7edacc547897"
 
 DEPENDS = "iucode-tool-native"
 S = "${WORKDIR}/git"
diff --git a/recipes-core/zlib/files/CVE-2018-25032-fuzz-fixed.patch b/recipes-core/zlib/files/CVE-2018-25032-fuzz-fixed.patch
new file mode 100644
index 00000000..778b3b9a
--- /dev/null
+++ b/recipes-core/zlib/files/CVE-2018-25032-fuzz-fixed.patch
@@ -0,0 +1,351 @@
+From c3970bb352f4f8cdb27d31e78c558bd1eb332f48 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Tue, 17 Apr 2018 22:09:22 -0700
+Subject: [PATCH] Fix a bug that can crash deflate on some input when using
+ Z_FIXED.
+
+This bug was reported by Danilo Ramos of Eideticom, Inc. It has
+lain in wait 13 years before being found! The bug was introduced
+in zlib 1.2.2.2, with the addition of the Z_FIXED option. That
+option forces the use of fixed Huffman codes. For rare inputs with
+a large number of distant matches, the pending buffer into which
+the compressed data is written can overwrite the distance symbol
+table which it overlays. That results in corrupted output due to
+invalid distances, and can result in out-of-bound accesses,
+crashing the application.
+
+The fix here combines the distance buffer and literal/length
+buffers into a single symbol buffer. Now three bytes of pending
+buffer space are opened up for each literal or length/distance
+pair consumed, instead of the previous two bytes. This assures
+that the pending buffer cannot overwrite the symbol table, since
+the maximum fixed code compressed length/distance is 31 bits, and
+since there are four bytes of pending space for every three bytes
+of symbol space.
+
+Upstream-Status: Backport
+[https://github.com/madler/zlib/commit/5c44459c3b28a9bd3283aaceab7c615f8020c531]
+CVE: CVE-2018-25032
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++---------------
+ deflate.h | 25 +++++++++----------
+ trees.c   | 50 +++++++++++--------------------------
+ 3 files changed, 79 insertions(+), 70 deletions(-)
+
+diff --git a/deflate.c b/deflate.c
+index b5e7849..2730035 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -237,11 +237,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     int wrap = 1;
+     static const char my_version[] = ZLIB_VERSION;
+ 
+-    ushf *overlay;
+-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+-     * output size for (length,distance) codes is <= 24 bits.
+-     */
+-
+     if (version == Z_NULL || version[0] != my_version[0] ||
+         stream_size != sizeof(z_stream)) {
+         return Z_VERSION_ERROR;
+@@ -324,9 +319,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+ 
+     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+ 
+-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+-    s->pending_buf = (uchf *) overlay;
+-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
++    /* We overlay pending_buf and sym_buf. This works since the average size
++     * for length/distance pairs over any compressed block is assured to be 31
++     * bits or less.
++     *
++     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
++     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
++     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
++     * possible fixed-codes length/distance pair is then 31 bits total.
++     *
++     * sym_buf starts one-fourth of the way into pending_buf. So there are
++     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
++     * in sym_buf is three bytes -- two for the distance and one for the
++     * literal/length. As each symbol is consumed, the pointer to the next
++     * sym_buf value to read moves forward three bytes. From that symbol, up to
++     * 31 bits are written to pending_buf. The closest the written pending_buf
++     * bits gets to the next sym_buf symbol to read is just before the last
++     * code is written. At that time, 31*(n-2) bits have been written, just
++     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
++     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
++     * symbols are written.) The closest the writing gets to what is unread is
++     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
++     * can range from 128 to 32768.
++     *
++     * Therefore, at a minimum, there are 142 bits of space between what is
++     * written and what is read in the overlain buffers, so the symbols cannot
++     * be overwritten by the compressed data. That space is actually 139 bits,
++     * due to the three-bit fixed-code block header.
++     *
++     * That covers the case where either Z_FIXED is specified, forcing fixed
++     * codes, or when the use of fixed codes is chosen, because that choice
++     * results in a smaller compressed block than dynamic codes. That latter
++     * condition then assures that the above analysis also covers all dynamic
++     * blocks. A dynamic-code block will only be chosen to be emitted if it has
++     * fewer bits than a fixed-code block would for the same set of symbols.
++     * Therefore its average symbol length is assured to be less than 31. So
++     * the compressed data for a dynamic block also cannot overwrite the
++     * symbols from which it is being constructed.
++     */
++
++    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
++    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
+ 
+     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+         s->pending_buf == Z_NULL) {
+@@ -335,8 +368,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+         deflateEnd (strm);
+         return Z_MEM_ERROR;
+     }
+-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
++    s->sym_buf = s->pending_buf + s->lit_bufsize;
++    s->sym_end = (s->lit_bufsize - 1) * 3;
++    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
++     * on 16 bit machines and because stored blocks are restricted to
++     * 64K-1 bytes.
++     */
+ 
+     s->level = level;
+     s->strategy = strategy;
+@@ -553,7 +590,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
+ 
+     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+     s = strm->state;
+-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
++    if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
+         return Z_BUF_ERROR;
+     do {
+         put = Buf_size - s->bi_valid;
+@@ -1125,7 +1162,6 @@ int ZEXPORT deflateCopy (dest, source)
+ #else
+     deflate_state *ds;
+     deflate_state *ss;
+-    ushf *overlay;
+ 
+ 
+     if (deflateStateCheck(source) || dest == Z_NULL) {
+@@ -1145,8 +1181,7 @@ int ZEXPORT deflateCopy (dest, source)
+     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+-    ds->pending_buf = (uchf *) overlay;
++    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+ 
+     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+         ds->pending_buf == Z_NULL) {
+@@ -1160,8 +1195,7 @@ int ZEXPORT deflateCopy (dest, source)
+     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+ 
+     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
++    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+ 
+     ds->l_desc.dyn_tree = ds->dyn_ltree;
+     ds->d_desc.dyn_tree = ds->dyn_dtree;
+@@ -1717,7 +1751,7 @@ local block_state deflate_fast(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -1848,7 +1882,7 @@ local block_state deflate_slow(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -1923,7 +1957,7 @@ local block_state deflate_rle(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -1962,7 +1996,7 @@ local block_state deflate_huff(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+diff --git a/deflate.h b/deflate.h
+index 7f31b54..8d84f8e 100644
+--- a/deflate.h
++++ b/deflate.h
+@@ -230,7 +230,7 @@ typedef struct internal_state {
+     /* Depth of each subtree used as tie breaker for trees of equal frequency
+      */
+ 
+-    uchf *l_buf;          /* buffer for literals or lengths */
++    uchf *sym_buf;        /* buffer for distances and literals/lengths */
+ 
+     uInt  lit_bufsize;
+     /* Size of match buffer for literals/lengths.  There are 4 reasons for
+@@ -252,13 +252,8 @@ typedef struct internal_state {
+      *   - I can't count above 4
+      */
+ 
+-    uInt last_lit;      /* running index in l_buf */
+-
+-    ushf *d_buf;
+-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+-     * the same number of elements. To use different lengths, an extra flag
+-     * array would be necessary.
+-     */
++    uInt sym_next;      /* running index in sym_buf */
++    uInt sym_end;       /* symbol table full when sym_next reaches this */
+ 
+     ulg opt_len;        /* bit length of current block with optimal trees */
+     ulg static_len;     /* bit length of current block with static trees */
+@@ -344,20 +339,22 @@ void ZLIB_INTERNAL bi_windup      OF((deflate_state *s));
+ 
+ # define _tr_tally_lit(s, c, flush) \
+   { uch cc = (c); \
+-    s->d_buf[s->last_lit] = 0; \
+-    s->l_buf[s->last_lit++] = cc; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = cc; \
+     s->dyn_ltree[cc].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+    }
+ # define _tr_tally_dist(s, distance, length, flush) \
+   { uch len = (uch)(length); \
+     ush dist = (ush)(distance); \
+-    s->d_buf[s->last_lit] = dist; \
+-    s->l_buf[s->last_lit++] = len; \
++    s->sym_buf[s->sym_next++] = dist; \
++    s->sym_buf[s->sym_next++] = dist >> 8; \
++    s->sym_buf[s->sym_next++] = len; \
+     dist--; \
+     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+     s->dyn_dtree[d_code(dist)].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+   }
+ #else
+ # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+diff --git a/trees.c b/trees.c
+index 7480efc..2fc7860 100644
+--- a/trees.c
++++ b/trees.c
+@@ -343,7 +343,7 @@ local void init_block(s)
+ 
+     s->dyn_ltree[END_BLOCK].Freq = 1;
+     s->opt_len = s->static_len = 0L;
+-    s->last_lit = s->matches = 0;
++    s->sym_next = s->matches = 0;
+ }
+ 
+ #define SMALLEST 1
+@@ -875,7 +875,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+ 
+         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+-                s->last_lit));
++                s->sym_next / 3));
+ 
+         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+ 
+@@ -944,8 +944,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+     unsigned dist;  /* distance of matched string */
+     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+ {
+-    s->d_buf[s->last_lit] = (ush)dist;
+-    s->l_buf[s->last_lit++] = (uch)lc;
++    s->sym_buf[s->sym_next++] = dist;
++    s->sym_buf[s->sym_next++] = dist >> 8;
++    s->sym_buf[s->sym_next++] = lc;
+     if (dist == 0) {
+         /* lc is the unmatched char */
+         s->dyn_ltree[lc].Freq++;
+@@ -960,30 +961,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+         s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+         s->dyn_dtree[d_code(dist)].Freq++;
+     }
+-
+-#ifdef TRUNCATE_BLOCK
+-    /* Try to guess if it is profitable to stop the current block here */
+-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+-        /* Compute an upper bound for the compressed length */
+-        ulg out_length = (ulg)s->last_lit*8L;
+-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+-        int dcode;
+-        for (dcode = 0; dcode < D_CODES; dcode++) {
+-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+-                (5L+extra_dbits[dcode]);
+-        }
+-        out_length >>= 3;
+-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+-               s->last_lit, in_length, out_length,
+-               100L - out_length*100L/in_length));
+-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+-    }
+-#endif
+-    return (s->last_lit == s->lit_bufsize-1);
+-    /* We avoid equality with lit_bufsize because of wraparound at 64K
+-     * on 16 bit machines and because stored blocks are restricted to
+-     * 64K-1 bytes.
+-     */
++    return (s->sym_next == s->sym_end);
+ }
+ 
+ /* ===========================================================================
+@@ -996,13 +974,14 @@ local void compress_block(s, ltree, dtree)
+ {
+     unsigned dist;      /* distance of matched string */
+     int lc;             /* match length or unmatched char (if dist == 0) */
+-    unsigned lx = 0;    /* running index in l_buf */
++    unsigned sx = 0;    /* running index in sym_buf */
+     unsigned code;      /* the code to send */
+     int extra;          /* number of extra bits to send */
+ 
+-    if (s->last_lit != 0) do {
+-        dist = s->d_buf[lx];
+-        lc = s->l_buf[lx++];
++    if (s->sym_next != 0) do {
++        dist = s->sym_buf[sx++] & 0xff;
++        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
++        lc = s->sym_buf[sx++];
+         if (dist == 0) {
+             send_code(s, lc, ltree); /* send a literal byte */
+             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+@@ -1027,11 +1006,10 @@ local void compress_block(s, ltree, dtree)
+             }
+         } /* literal or match pair ? */
+ 
+-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+-               "pendingBuf overflow");
++        /* Check that the overlay between pending_buf and sym_buf is ok: */
++        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+ 
+-    } while (lx < s->last_lit);
++    } while (sx < s->sym_next);
+ 
+     send_code(s, END_BLOCK, ltree);
+ }
+-- 
+2.35.1
+
diff --git a/recipes-core/zlib/files/fix-removed-last-lit.patch b/recipes-core/zlib/files/fix-removed-last-lit.patch
new file mode 100644
index 00000000..238ecfbe
--- /dev/null
+++ b/recipes-core/zlib/files/fix-removed-last-lit.patch
@@ -0,0 +1,41 @@
+From bf7f8fd281afee27c160cd1e904b2ff52eb9e493 Mon Sep 17 00:00:00 2001
+From: Chee Yang Lee <chee.yang.lee@intel.com>
+Date: Thu, 31 Mar 2022 22:00:10 +0800
+Subject: [PATCH] fix removed last_lit
+
+last_lit removed and replaced with sym_next while fix for
+CVE-2018-25032. causing build error for deflate_medium.c.
+
+| deflate_medium.c: In function 'deflate_medium':
+| deflate_medium.c:308:12: error: 'deflate_state' {aka 'struct
+internal_state'} has no member named 'last_lit'; did you mean
+'last_flush'?
+|   308 |     if (s->last_lit)
+|       |            ^~~~~~~~
+|       |            last_flush
+| make: *** [Makefile:307: deflate_medium.lo] Error 1
+
+
+Upstream-Status: Inappropriate 
+[upstream have not taken the CVE fix patches]
+Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com>
+---
+ deflate_medium.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deflate_medium.c b/deflate_medium.c
+index 582e8b2..30f7633 100644
+--- a/deflate_medium.c
++++ b/deflate_medium.c
+@@ -305,7 +305,7 @@ block_state deflate_medium(deflate_state *s, int flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+-- 
+2.35.1
+
diff --git a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
index 65303bff..038171dc 100644
--- a/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
+++ b/recipes-core/zlib/zlib-intel_1.2.11.1.jtkv6.3.bb
@@ -6,8 +6,13 @@ SUMMARY = "Zlib Compression Library (Intel-tuned)"
 
 PROVIDES = "zlib"
 
-SRC_URI_remove = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI_prepend = "git://github.com/jtkukunas/zlib.git;protocol=git "
+SRC_URI = "git://github.com/jtkukunas/zlib.git;protocol=https;branch=master \
+           file://ldflags-tests.patch \
+           file://run-ptest \
+           file://CVE-2018-25032-fuzz-fixed.patch \
+           file://fix-removed-last-lit.patch \
+           file://CVE-2022-37434.patch \
+           "
 
 SRCREV = "a43a247bfa16ec5368747b5b64f11ea5ca033010"
 S = "${WORKDIR}/git"
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb b/recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb
index 1c767332..f3716877 100644
--- a/recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb
+++ b/recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb
@@ -39,3 +39,6 @@ PACKAGES += "${PN}-script"
 FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity"
 
 EXCLUDE_FROM_WORLD = "1"
+
+# This was fixed in kernel v4.4
+CVE_CHECK_WHITELIST += "CVE-2015-1142857"
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb
index ecd974fe..8ae221bc 100644
--- a/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb
+++ b/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb
@@ -40,3 +40,6 @@ do_install_append () {
 PACKAGES += "${PN}-script"
 
 FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity"
+
+# This was fixed in kernel v4.4
+CVE_CHECK_WHITELIST += "CVE-2015-1142857"
diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb
index 4da6e3b9..12dda6cb 100644
--- a/recipes-kernel/linux/linux-intel-dev.bb
+++ b/recipes-kernel/linux/linux-intel-dev.bb
@@ -6,7 +6,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
 SRC_URI = " \
            git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \
-           file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
+           file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
           "
 SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
 
@@ -15,13 +15,13 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 KMETA_BRANCH = "master"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.5-rc3"
-SRCREV_machine ?= "0c5d381c6f1ebd88b4da2c3392f86d1611daba84"
-SRCREV_meta ?= "1b65db46af4e00e257a6be18cb06736cb83d54dd"
+LINUX_VERSION ?= "5.19.0"
+SRCREV_machine ?= "270ddbd02fe9e1761ebccf792acadbb3cd52b69f"
+SRCREV_meta ?= "423df1333e1e2a0c2bff9b29d40d16d74b775a79"
 
 LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/recipes-kernel/linux/linux-intel-rt_5.4.bb b/recipes-kernel/linux/linux-intel-rt_5.4.bb
index ed9ddb7a..15c8febf 100644
--- a/recipes-kernel/linux/linux-intel-rt_5.4.bb
+++ b/recipes-kernel/linux/linux-intel-rt_5.4.bb
@@ -17,8 +17,13 @@ KMETA_BRANCH = "yocto-5.4"
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.4.70"
-SRCREV_machine ?= "6f0f7e5dd27c1798d0d58ccdf3cccebf79aef8a0"
-SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0"
+LINUX_VERSION ?= "5.4.209"
+SRCREV_machine ?= "70a06857dca28633fad857b852c6c86189438afb"
+SRCREV_meta ?= "c917f683a6394ae00f81139ae57ae0112d4b7528"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
+
+# Kernel config 'CONFIG_GPIO_LYNXPOINT' goes by a different name 'CONFIG_PINCTRL_LYNXPOINT' in
+# linux-intel 5.4 specifically. This causes a warning during kernel config audit. Suppress the
+# harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"
diff --git a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
new file mode 100644
index 00000000..0ebbb008
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
@@ -0,0 +1,50 @@
+From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Fri, 12 Aug 2022 13:12:18 +0800
+Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location
+
+In some cross build environments such as the Yocto Project build
+environment it provides an ncurses library that is compiled
+differently than the host's version.  This causes display corruption
+problems when the host's curses includes are used instead of the
+includes from the provided compiler are overridden.  There is a second
+case where there is no curses libraries at all on the host system and
+menuconfig will just fail entirely.
+
+The solution is simply to allow an override variable in
+check-lxdialog.sh for environments such as the Yocto Project.  Adding
+a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+compiling and linking against the right headers and libraries.
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+cc: Michal Marek <mmarek@suse.cz>
+cc: linux-kbuild@vger.kernel.org
+Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ scripts/kconfig/mconf-cfg.sh | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
+index 025b565e0b7c..6514d19790e6 100755
+--- a/scripts/kconfig/mconf-cfg.sh
++++ b/scripts/kconfig/mconf-cfg.sh
+@@ -4,6 +4,15 @@
+ PKG="ncursesw"
+ PKG2="ncurses"
+ 
++if [ "$CROSS_CURSES_LIB" != "" ]; then
++    echo libs=\'$CROSS_CURSES_LIB\'
++    if [ x"$CROSS_CURSES_INC" != x ]; then
++        echo cflags=\'$CROSS_CURSES_INC\'
++    fi
++    exit 0
++fi
++
++
+ if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
+        if ${HOSTPKG_CONFIG} --exists $PKG; then
+                echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
+-- 
+2.25.1
+
diff --git a/recipes-kernel/linux/linux-intel_5.4.bb b/recipes-kernel/linux/linux-intel_5.4.bb
index a079ebd2..df56b370 100644
--- a/recipes-kernel/linux/linux-intel_5.4.bb
+++ b/recipes-kernel/linux/linux-intel_5.4.bb
@@ -9,9 +9,9 @@ SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurs
 
 DEPENDS += "elfutils-native openssl-native util-linux-native"
 
-LINUX_VERSION ?= "5.4.81"
-SRCREV_machine ?= "b3d20595bdf59d0784cb8256445fff65df26c4ac"
-SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0"
+LINUX_VERSION ?= "5.4.209"
+SRCREV_machine ?= "ea2d8185fa954bc9c9a0c703cc4ff9c4b5cb8df5"
+SRCREV_meta ?= "c917f683a6394ae00f81139ae57ae0112d4b7528"
 
 # For Crystalforest and Romley
 KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio"
@@ -19,3 +19,8 @@ KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio"
 
 # Functionality flags
 KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc"
+
+# Kernel config 'CONFIG_GPIO_LYNXPOINT' goes by a different name 'CONFIG_PINCTRL_LYNXPOINT' in
+# linux-intel 5.4 specifically. This causes a warning during kernel config audit. Suppress the
+# harmless warning for now.
+KCONF_BSP_AUDIT_LEVEL = "0"
diff --git a/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb b/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb
index 3a0d278e..6d0ad7c7 100644
--- a/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb
+++ b/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb
@@ -3,11 +3,11 @@
 
 require recipes-graphics/libva/libva-utils_2.6.0.bb
 
-SRC_URI_remove = "git://github.com/intel/libva-utils.git;branch=v2.6-branch"
-SRC_URI_prepend = "git://github.com/intel/libva-utils.git;branch=v2.7-branch "
+SRC_URI_remove = "git://github.com/intel/libva-utils.git;branch=v2.6-branch;protocol=https"
+SRC_URI_prepend = "git://github.com/intel/libva-utils.git;branch=v2.7-branch;protocol=https "
 
 SRCREV = "5a24c635f6fb2b9ac31cab3360afca50e1860812"
 S = "${WORKDIR}/git"
 
 PROVIDES = "libva-utils"
-RPROVIDES_${PN} += "libva-uitls"
+RPROVIDES_${PN} += "libva-utils"