5 files changed, 34 insertions, 113 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
deleted file mode 100644
index d1851406..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b8c3bae71e6d3417ade5cb537cb1785fd75a75c8 Mon Sep 17 00:00:00 2001
-From: Razvan Apetroaie <117895604+razvanapetroaie@users.noreply.github.com>
-Date: Tue, 20 Feb 2024 02:28:14 +0200
-Subject: [PATCH] [CPU] Solving the build failure caused by setting the
- "ENABLE_OV_ONNX_FRONTEND" option to "OFF" (#22934)
-
-### Details:
-See the [ticket
-description](https://jira.devtools.intel.com/browse/CVS-132119). The
-solution was checked only on a local setup on Ubuntu, if there's a way
-to check that using the CI please let me know (or if you could run the
-job and paste the link in the comments I would be grateful).
-
-Disclaimer: I'm not a CPU plugin developer, so I can't tell for sure if
-this is the ideal fix and no side effects are introduced. Please take
-that into account when reviewing/merging.
-
-### Tickets:
- - [CVS-132119](https://jira.devtools.intel.com/browse/CVS-132119)
-
-Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/b8c3bae71e6d3417ade5cb537cb1785fd75a75c8]
-
-Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
----
- src/plugins/intel_cpu/tests/functional/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-index db5ae8d01c..6941cb528d 100644
---- a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-+++ b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets ov_snipp
- if(ENABLE_OV_ONNX_FRONTEND)
-     list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}")
- else()
--    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
-+    set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/custom/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx)
- endif()
- 
- if(NOT (ARM OR AARCH64))
--- 
-2.34.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
deleted file mode 100644
index d251f21b..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b5dfcf8bc1245e804c847745c237068eb6f19931 Mon Sep 17 00:00:00 2001
-From: Yogesh Tyagi <yogesh.tyagi@intel.com>
-Date: Fri, 15 Mar 2024 16:28:41 +0800
-Subject: [PATCH] cmake: fix build when using sysroot
-
-When cross-compiling against a sysroot, system headers will not be at a place
-that starts with /usr. Update conditional check to exclude directories
-which have "/usr/include" in them to not add <sysroot>/usr/include as well.
-
-Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/23486]
-
-Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
----
- src/cmake/ov_parallel.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake
-index 3793db98e30..819d3410531 100644
---- a/src/cmake/ov_parallel.cmake
-+++ b/src/cmake/ov_parallel.cmake
-@@ -296,7 +296,7 @@ function(ov_set_threading_interface_for TARGET_NAME)
-                 if(include_directories)
-                     foreach(include_directory IN LISTS include_directories)
-                         # cannot include /usr/include headers as SYSTEM
--                        if(NOT "${include_directory}" MATCHES "^/usr.*$")
-+                        if(NOT "${include_directory}" MATCHES ".*/usr/include.*$")
-                             target_include_directories(${TARGET_NAME} SYSTEM
-                                 ${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>)
-                         else()
--- 
-2.34.1
-
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
index 7ab31309..7f5b46c6 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch
@@ -1,11 +1,11 @@
-From bfcf5ae581ca4e7266cf7dc65b1c71754cd78cc0 Mon Sep 17 00:00:00 2001
+From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:42:57 +0530
-Subject: [PATCH 1/4] cmake: yocto specific tweaks to the build process
+Subject: [PATCH] cmake: yocto specific tweaks to the build process
 
 * Dont try to detect glibc version as that doesn't work when cross compiling.
+* Dont try to detect CXX11_ABI
 * Install sample binaries as well.
-* Dont strip binaries.
 * Dont try to write triggers for CPack. We package ourselves.
 * Fix the installation path for Python modules when baselib = lib64.
 
@@ -14,17 +14,16 @@ Upstream-Status: Inappropriate
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
  cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
- cmake/developer_package/target_flags.cmake      | 2 +-
+ cmake/developer_package/target_flags.cmake      | 4 ++--
  samples/cpp/CMakeLists.txt                      | 6 +++---
  src/bindings/python/CMakeLists.txt              | 2 +-
- src/bindings/python/wheel/setup.py              | 1 -
- 5 files changed, 6 insertions(+), 7 deletions(-)
+ 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 a7c0ec2cf61..40448e8a962 100644
+index 99f11730983..1a1f61fcd3d 100644
 --- a/cmake/developer_package/packaging/rpm/rpm.cmake
 +++ b/cmake/developer_package/packaging/rpm/rpm.cmake
-@@ -154,7 +154,7 @@ ov_rpm_specific_settings()
+@@ -156,7 +156,7 @@ ov_rpm_specific_settings()
  # needed to add triggers for packages with libraries
  set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
  set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
@@ -34,17 +33,26 @@ index a7c0ec2cf61..40448e8a962 100644
  #
  # Functions helpful for packaging your modules with RPM cpack
 diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
-index 29f23e713e1..942dd445b19 100644
+index d047a1aebd9..4e8ca68c60f 100644
 --- a/cmake/developer_package/target_flags.cmake
 +++ b/cmake/developer_package/target_flags.cmake
-@@ -145,4 +145,4 @@ function(ov_glibc_version)
+@@ -149,7 +149,7 @@ function(ov_glibc_version)
      endif()
  endfunction()
  
 -ov_glibc_version()
 +#ov_glibc_version()
+ 
+ #
+ # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler
+@@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi)
+     endif()
+ endmacro()
+ 
+-ov_get_glibcxx_use_cxx11_abi()
++#ov_get_glibcxx_use_cxx11_abi()
 diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
-index c814cc37e2c..431e7bd2ed3 100644
+index 4d33bff944e..3e7f1458578 100644
 --- a/samples/cpp/CMakeLists.txt
 +++ b/samples/cpp/CMakeLists.txt
 @@ -206,9 +206,9 @@ macro(ov_add_sample)
@@ -61,30 +69,18 @@ index c814cc37e2c..431e7bd2ed3 100644
      # create global target with all samples / demo apps
      if(NOT TARGET ov_samples)
 diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
-index 58ff9b74302..4763994ba56 100644
+index 6cf43ec3fed..d539b9d003f 100644
 --- a/src/bindings/python/CMakeLists.txt
 +++ b/src/bindings/python/CMakeLists.txt
-@@ -356,7 +356,7 @@ if(ENABLE_PYTHON_PACKAGING)
-     endif()
+@@ -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(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
-     set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO")
- 
-diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
-index 4b056912212..5f05d891310 100644
---- a/src/bindings/python/wheel/setup.py
-+++ b/src/bindings/python/wheel/setup.py
-@@ -270,7 +270,6 @@ class CustomBuild(build):
-                 self.spawn(["cmake", "--install", binary_dir,
-                                      "--prefix", prefix,
-                                      "--config", CONFIG,
--                                     "--strip",
-                                      "--component", cpack_comp_name])
+     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")
  
-     def run(self):
 -- 
 2.34.1
 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
index e0967d55..8a1464d5 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-cmake-Fix-overloaded-virtual-error.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch
@@ -1,7 +1,7 @@
-From 900eeeb2953095e651270c0f42ccd8b26fd7885c Mon Sep 17 00:00:00 2001
+From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:49:35 +0530
-Subject: [PATCH 3/4] cmake: Fix overloaded-virtual error
+Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error
 
 * Remove -Werror for:
 |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=]
@@ -16,10 +16,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt
-index b0c66a435d6..a3037147cc2 100644
+index 2f3d9127dde..2fd4f5c1b3c 100644
 --- a/src/plugins/intel_gpu/CMakeLists.txt
 +++ b/src/plugins/intel_gpu/CMakeLists.txt
-@@ -38,7 +38,7 @@ add_subdirectory(thirdparty)
+@@ -47,7 +47,7 @@ add_subdirectory(thirdparty)
  include(thirdparty/cmake/rapidjson.cmake)
  
  if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
index 59095133..bbdeaa2a 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-protobuf-allow-target-protoc-to-be-built.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch
@@ -1,7 +1,7 @@
-From 3e288ed876c6bcb6aa3174e52446b479255ddf22 Mon Sep 17 00:00:00 2001
+From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Wed, 29 Nov 2023 12:55:19 +0530
-Subject: [PATCH 4/4] protobuf: allow target protoc to be built
+Subject: [PATCH 3/3] protobuf: allow target protoc to be built
 
 We can run target binaries using a qemu wrapper so allow these to be
 built and run.
@@ -15,10 +15,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
-index 49c5b881030..2a1ea8562bc 100644
+index f3b5520d6d2..7579f638c5a 100644
 --- a/cmake/developer_package/frontends/frontends.cmake
 +++ b/cmake/developer_package/frontends/frontends.cmake
-@@ -143,7 +143,7 @@ macro(ov_add_frontend)
+@@ -163,7 +163,7 @@ macro(ov_add_frontend)
          set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h)
          add_custom_command(
                  OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}"
@@ -28,10 +28,10 @@ index 49c5b881030..2a1ea8562bc 100644
                  COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}"
                  VERBATIM
 diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt
-index 4b6d6da87f3..409e492a5b3 100644
+index 15f32601f23..36853caf7dc 100644
 --- a/thirdparty/protobuf/CMakeLists.txt
 +++ b/thirdparty/protobuf/CMakeLists.txt
-@@ -28,7 +28,7 @@ set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Abseil protogate CXX standard to depen
+@@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE)
  if(CMAKE_CROSSCOMPILING OR
      (APPLE AND (HOST_X86_64 AND AARCH64)) OR
      (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM))))