11 files changed, 145 insertions, 852 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
new file mode 100644
index 00000000..4474aa3c
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch
@@ -0,0 +1,38 @@
+From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 18 May 2022 12:24:03 +0800
+Subject: [PATCH] CMakeLists: disable Werror
+gcc12 highlights minor warnings that cause the build to fail. Ignore
+those until they aren't fixed upstream.
+Upstream-Status: Inappropriate
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 418483f7..c019fea0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -146,7 +146,7 @@ else()
+   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
+   if(LNX_BUILD)
+     #A few warnings yet to resolve under esx
+-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
+    #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror")
+     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror")
+   endif()
+   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
+@@ -791,4 +791,4 @@ if(ESX_BUILD)
+   include(CMake/esx.cmake)
+ endif()
+ 
+-add_subdirectory(src/os/nvm_api_sample)
+\ No newline at end of file
+add_subdirectory(src/os/nvm_api_sample)
+-- 
+2.35.3
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
new file mode 100644
index 00000000..8a734ed2
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -0,0 +1,62 @@
+Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
+ builds
+Upstream-Status: Backport
+Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
+---
+ MdePkg/Include/Base.h | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+Index: edk2/MdePkg/Include/Base.h
+===================================================================
+--- edk2.orig/MdePkg/Include/Base.h
+++ edk2/MdePkg/Include/Base.h
+@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
+ #define NULL  __null
+   #endif
+ #else
+#ifndef OS_BUILD
+#ifndef UNIT_TEST_UEFI_BUILD
+ #define NULL  ((VOID *) 0)
+ #endif
+#endif
+#endif
+ 
+ //
+ // Null character
+@@ -813,6 +817,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");
+@@ -841,7 +847,8 @@ STATIC_ASSERT (ALIGNOF (CHAR16)  == size
+ STATIC_ASSERT (ALIGNOF (INTN)    == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (UINTN)   == sizeof (UINTN), "Alignment of UINTN does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (VOID *)  == sizeof (VOID *), "Alignment of VOID * does not meet UEFI Specification Data Type requirements");
+-
+#endif
+#endif
+ //
+ // The following three enum types are used to verify that the compiler
+ // configuration for enum types is compliant with Section 2.3.1 of the
+@@ -861,6 +868,8 @@ typedef enum {
+   __VerifyInt32EnumValue = 0x7fffffff
+ } __VERIFY_INT32_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");
+ STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
+@@ -868,6 +877,8 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_EN
+ STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE)  == sizeof (__VERIFY_UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) == sizeof (__VERIFY_UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
+ STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM_SIZE), "Alignment 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
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
new file mode 100644
index 00000000..7b95ffe4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
@@ -0,0 +1,45 @@
+SUMMARY = "Utility for managing Intel Optane DC persistent memory modules"
+DESCRIPTION = "Utility for configuring and managing Intel Optane Persistent \
+Memory modules (PMem). It supports functionality to: \
+Discover DCPMMs on the platform. \
+Provision the platform memory configuration. \
+View and update the firmware on DCPMMs. \
+Configure data-at-rest security on DCPMMs. \
+Track health and performance of DCPMMs. \
+Debug and troubleshoot DCPMMs."
+HOMEPAGE = "https://github.com/intel/ipmctl"
+BUGTRACKER = "https://github.com/intel/ipmctl/issues"
+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=master_3_0;name=ipmctl; \
+        git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/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 = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
+#tag edk2-stable202408
+SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201"
+SRCREV_FORMAT = "ipmctl_edk2"
+inherit cmake dos2unix
+DEPENDS = "ndctl pkgconfig-native"
+EXTRA_OECMAKE = "-DRELEASE=ON"
+do_configure:prepend() {
+    for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do
+        ln -sf edk2/${dir} ${S}
+    done
+}
+do_install:append() {
+    # Remove /var/log/ipmctl as anything created in /var/log will not be
+    # available when tmpfs is mounted at /var/volatile/log.
+    rm -rf ${D}${localstatedir}/log
+} 
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
deleted file mode 100644
index 88aab623..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 92df2822c7bc50275bb6a170820e04408db50040 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Tue, 9 Jun 2020 11:35:59 +0800
-Subject: [PATCH] don't install licenses and version
-Upstream-Status: Inappropriate
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- ngraph/CMakeLists.txt              | 13 ++-----------
- ngraph/test/runtime/CMakeLists.txt |  2 ++
- 2 files changed, 4 insertions(+), 11 deletions(-)
-diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
-index 4eb969f02..c52aec2ec 100644
--- a/ngraph/CMakeLists.txt
-+++ b/ngraph/CMakeLists.txt
-@@ -496,7 +496,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
-     install(EXPORT ngraphTargets
-         FILE ngraphTargets.cmake
-         NAMESPACE ngraph::
-        DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-         COMPONENT ngraph)
- 
-     configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in
-@@ -509,15 +509,6 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
- 
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
-         ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
-        DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
-         COMPONENT ngraph)
- endif()
-
-install(DIRECTORY
-    ${CMAKE_CURRENT_SOURCE_DIR}/licenses
-    DESTINATION "${NGRAPH_COMPONENT_PREFIX}."
-    COMPONENT ngraph
-)
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
-diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
-index e37aba8b7..83ed2efbd 100644
--- a/ngraph/test/runtime/CMakeLists.txt
-+++ b/ngraph/test/runtime/CMakeLists.txt
-@@ -68,3 +68,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
- 
- add_subdirectory(interpreter)
- add_subdirectory(ie)
-+
-+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB})
-- 
-2.26.2
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
deleted file mode 100644
index bbf186df..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 7e2525fbe9a051197d76fe1ceb94b857eae33409 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 10 Jun 2020 09:43:55 +0800
-Subject: [PATCH] inference-engine: use system installed packages
-Use installed versions of pugixml, ade, protobuf and tbb.
-Upstream-Status: Pending
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- cmake/dependencies.cmake                      | 17 --------------
- inference-engine/CMakeLists.txt               |  2 +-
- inference-engine/cmake/ie_parallel.cmake      |  7 +-----
- .../src/inference_engine/CMakeLists.txt       | 23 +------------------
- .../src/legacy_api/CMakeLists.txt             |  3 +--
- .../src/vpu/graph_transformer/CMakeLists.txt  |  1 -
- .../common_test_utils/CMakeLists.txt          |  7 ++----
- .../unit_test_utils/CMakeLists.txt            |  3 +--
- .../tests_deprecated/helpers/CMakeLists.txt   |  1 -
- inference-engine/thirdparty/CMakeLists.txt    | 14 +----------
- 10 files changed, 8 insertions(+), 70 deletions(-)
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index 2a5a74db6..9cc9a6c94 100644
--- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -13,25 +13,8 @@ if(CMAKE_CROSSCOMPILING)
- 
-        set(protoc_version "3.7.1")
-        if(CMAKE_HOST_SYSTEM_NAME MATCHES Linux)
-           RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
-                                      ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
-                                      TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64")
-           debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
-        else()
-                message(FATAL_ERROR "Unsupported host system (${CMAKE_HOST_SYSTEM_NAME}) and arch (${CMAKE_HOST_SYSTEM_PROCESSOR}) for cross-compilation")
-        endif()
- 
-    reset_deps_cache(SYSTEM_PROTOC)
-
-    message("${SYSTEM_PROTOC_ROOT}/bin")
-    find_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()
-diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
-index 7f45ab021..db85e8690 100644
--- a/inference-engine/CMakeLists.txt
-+++ b/inference-engine/CMakeLists.txt
-@@ -57,7 +57,7 @@ function(ie_developer_export)
-         APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
- 
-     # Custom target to build only Inference Engine Developer Package targets
-    add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets} gflags
-+    add_custom_target(ie_dev_targets ALL DEPENDS ${OpenVINODeveloperPackageTargets} ${IEDeveloperPackageTargets}
-                       inference_engine_ir_reader inference_engine_ir_v7_reader)
- endfunction()
- 
-diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
-index 7fd77ccc0..143dcf669 100644
--- a/inference-engine/cmake/ie_parallel.cmake
-+++ b/inference-engine/cmake/ie_parallel.cmake
-@@ -62,13 +62,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
-     set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
- 
-     if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-        if (TBB_FOUND)
-             set(IE_THREAD_DEFINE "IE_THREAD_TBB")
-            ie_target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${TBB_IMPORTED_TARGETS})
-        else ()
-            ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \
-                                 SEQ method will be used for ${TARGET_NAME}")
-        endif ()
-+           target_link_libraries(${TARGET_NAME} INTERFACE tbb tbbmalloc)
-     elseif (THREADING STREQUAL "OMP")
-         if (WIN32)
-             set(omp_lib_name libiomp5md)
-diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index 9ab888983..105e666a3 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -127,7 +127,6 @@ target_include_directories(${TARGET_NAME}_common_obj PRIVATE
-     $<TARGET_PROPERTY:${TARGET_NAME}_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
- 
- target_include_directories(${TARGET_NAME}_common_obj SYSTEM PRIVATE
-    $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
-     $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
- 
- # Create object library
-@@ -139,8 +138,7 @@ add_library(${TARGET_NAME}_obj OBJECT
- 
- target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API)
- 
-target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
-                                                             $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
-+target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
- 
- target_include_directories(${TARGET_NAME}_obj PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
-                                                       "${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader" # for ie_ir_version.hpp
-@@ -233,25 +231,6 @@ list(APPEND core_components ngraph)
- if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
-     ie_cpack_add_component(tbb REQUIRED)
-     list(APPEND core_components tbb)
-
-    install(DIRECTORY "${TBB}/include"
-            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-            COMPONENT tbb)
-    install(DIRECTORY "${TBB}/lib"
-            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-            COMPONENT tbb)
-    if(EXISTS "${TBB}/bin")
-      install(DIRECTORY "${TBB}/bin"
-              DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-              COMPONENT tbb)
-    endif()
-    install(FILES "${TBB}/LICENSE"
-            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-            COMPONENT tbb)
-    install(FILES "${TBB}/cmake/TBBConfig.cmake"
-                  "${TBB}/cmake/TBBConfigVersion.cmake"
-            DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
-            COMPONENT tbb)
- endif()
- 
- ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
-diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
-index ed87a073a..adc970a09 100644
--- a/inference-engine/src/legacy_api/CMakeLists.txt
-+++ b/inference-engine/src/legacy_api/CMakeLists.txt
-@@ -39,8 +39,7 @@ target_include_directories(${TARGET_NAME}_obj PRIVATE
-     ${IE_MAIN_SOURCE_DIR}/src/inference_engine                                          # For CNNNetworkNGraphImpl
-     $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
-     $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>)
-+    $<TARGET_PROPERTY:ngraph::ngraph,INTERFACE_INCLUDE_DIRECTORIES>)
- 
- # Create shared library
- 
-diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
-index a45437453..7a67a8226 100644
--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
-+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
-@@ -35,7 +35,6 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
- 
-     target_include_directories(${TARGET_NAME}
-         SYSTEM PUBLIC
-            $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
-             $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
-             "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
- 
-diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-index efead7271..732abee2d 100644
--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
-@@ -23,7 +23,7 @@ function(add_gtest_libraries)
-                           PROPERTIES FOLDER thirdparty)
- endfunction()
- 
-add_gtest_libraries()
-+#add_gtest_libraries()
- 
- if (MSVC)
-     set(PUGI pugixml_mt)
-@@ -32,10 +32,7 @@ else ()
- endif ()
- 
- list(APPEND EXPORT_DEPENDENCIES
-        ${PUGI}
-         ${NGRAPH_LIBRARIES}
-        gtest
-        gtest_main
-         )
- 
- set(TARGET_NAME commonTestUtils)
-@@ -74,7 +71,6 @@ function(add_common_utils ADD_TARGET_NAME)
-             PUBLIC
-             ${IE_TESTS_ROOT}/ie_test_utils
-             $<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
-            $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
-             PRIVATE
-             $<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
-             )
-@@ -84,6 +80,7 @@ function(add_common_utils ADD_TARGET_NAME)
-     target_link_libraries(${ADD_TARGET_NAME}
-             PUBLIC
-             ${EXPORT_DEPENDENCIES}
-+           pugixml
-             )
- endfunction()
- 
-diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-index dbb0f4e5b..9586d651d 100644
--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
-@@ -9,8 +9,7 @@ add_subdirectory(mocks/mock_engine)
- list(APPEND EXPORT_DEPENDENCIES
-         commonTestUtils_s
-         inference_engine_s
-        inference_engine_lp_transformations
-        gmock)
-+        inference_engine_lp_transformations)
- 
- addIeTarget(
-         NAME ${TARGET_NAME}
-diff --git a/inference-engine/tests_deprecated/helpers/CMakeLists.txt b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
-index 2bc668965..e44ab9d5d 100644
--- a/inference-engine/tests_deprecated/helpers/CMakeLists.txt
-+++ b/inference-engine/tests_deprecated/helpers/CMakeLists.txt
-@@ -22,7 +22,6 @@ function(add_helpers target_name)
-     target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
-                                                      "${IE_MAIN_SOURCE_DIR}/src/inference_engine"
-                                                      $<TARGET_PROPERTY:inference_engine_lp_transformations,INTERFACE_INCLUDE_DIRECTORIES>
-                                                     $<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
-                                                      "${IE_MAIN_SOURCE_DIR}/src/vpu/"
-                                              PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
- 
-diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
-index a2550bfaa..0eb616415 100644
--- a/inference-engine/thirdparty/CMakeLists.txt
-+++ b/inference-engine/thirdparty/CMakeLists.txt
-@@ -51,28 +51,16 @@ function(build_with_lto)
-     function(ie_build_pugixml)
-         set(BUILD_TESTS_current ${BUILD_TESTS})
-         set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
-        add_subdirectory(pugixml)
-         set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE)
-     endfunction()
- 
-     ie_build_pugixml()
-     add_subdirectory(stb_lib)
-    add_subdirectory(ade)
-     add_subdirectory(fluid/modules/gapi)
- 
-    target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
-
-    set_target_properties(pugixml ade fluid stb_image
-+    set_target_properties(fluid stb_image
-                           PROPERTIES FOLDER thirdparty)
- 
-    # developer package
-
-    ie_developer_export_targets(ade fluid pugixml)
-    if(TARGET pugixml_mt)
-        ie_developer_export_targets(pugixml_mt)
-        set_target_properties(pugixml_mt PROPERTIES FOLDER thirdparty)
-    endif()
-
-     if(ENABLE_MKL_DNN)
-         set(SDL_cmake_included ON)
-         include(mkldnn.cmake)
-- 
-2.26.2
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
deleted file mode 100644
index a4e58b8e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 10 Jun 2020 09:45:48 +0800
-Subject: [PATCH 2/5] cldNN: disable Werror
-Don't treat warnings as errors. This just leads to failures every time
-we upgrade the compiler.
-Upstream-Status: Inappropriate
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-index 4b444eca..8610b9b8 100644
--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
-+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-@@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
-         MultiProcessorCompilation
-         DeadCodeEliminate
-         ExtensionsEnabled
-        TreatWarnAsErrorEnabled
-         WarnLevel4
-         NoFastMath
-         StackProtector
-- 
-2.25.4
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
deleted file mode 100644
index 9c91ac4d..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From 5bec3199ec6fd8f784cd688159f768a732c9ad69 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 11 Jun 2020 14:24:04 +0800
-Subject: [PATCH] cmake installation fixes
-Make sure that libraries/samples/binaries are installed correctly.
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- CMakeLists.txt                                     | 14 --------------
- cmake/developer_package.cmake                      | 10 ++++++----
- .../samples/common/opencv_c_wraper/CMakeLists.txt  |  2 ++
- inference-engine/samples/CMakeLists.txt            |  9 +++------
- .../samples/common/format_reader/CMakeLists.txt    |  2 ++
- .../src/inference_engine/CMakeLists.txt            |  4 ++--
- .../src/vpu/myriad_plugin/CMakeLists.txt           |  2 +-
- inference-engine/tests/unit/cpu/CMakeLists.txt     |  4 +++-
- .../tests/unit/inference_engine/CMakeLists.txt     |  2 ++
- inference-engine/tests/unit/vpu/CMakeLists.txt     |  4 +++-
- inference-engine/tools/compile_tool/CMakeLists.txt |  2 +-
- 11 files changed, 25 insertions(+), 30 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 18ed02ee5..18f6094f3 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -143,12 +143,8 @@ add_subdirectory(docs)
- 
- # install setupvars
- 
-ie_cpack_add_component(setupvars REQUIRED)
- 
- if(UNIX)
-    install(PROGRAMS scripts/setupvars/setupvars.sh
-            DESTINATION bin
-            COMPONENT setupvars)
- elseif(WIN32)
-     install(PROGRAMS scripts/setupvars/setupvars.bat
-             DESTINATION bin
-@@ -158,22 +154,12 @@ endif()
- # install install_dependencies
- 
- if(UNIX)
-    ie_cpack_add_component(install_dependencies REQUIRED)
-    install(DIRECTORY scripts/install_dependencies/
-            DESTINATION install_dependencies
-            COMPONENT install_dependencies)
- endif()
- 
- # install files for demo
- 
-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
- 
- if(UNIX)
-    install(DIRECTORY scripts/demo/
-            DESTINATION deployment_tools/demo
-            COMPONENT demo_scripts
-            USE_SOURCE_PERMISSIONS
-            PATTERN *.bat EXCLUDE)
- elseif(WIN32)
-     install(DIRECTORY scripts/demo/
-             DESTINATION deployment_tools/demo
-diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
-index 86137c384..af011c361 100644
--- a/cmake/developer_package.cmake
-+++ b/cmake/developer_package.cmake
-@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH
- include(CPackComponent)
- unset(IE_CPACK_COMPONENTS_ALL CACHE)
- 
-set(IE_CPACK_IE_DIR       deployment_tools/inference_engine)
-+if (NOT DEFINED IE_CPACK_IE_DIR)
-+    set(IE_CPACK_IE_DIR       deployment_tools/inference_engine)
-+endif()
- 
- # Search packages for the host system instead of packages for the target system
- # in case of cross compilation these macros should be defined by the toolchain file
-@@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir)
-         set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
-     else()
-        set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
-        set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} 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 ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
-     endif()
- endfunction()
-@@ -147,7 +149,7 @@ endif()
- 
- # allow to override default OUTPUT_ROOT root
- if(NOT DEFINED OUTPUT_ROOT)
-    set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
-+    set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
- endif()
- 
- # Enable postfixes for Debug/Release builds
-diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
-index b8d5ddf62..d086478f6 100644
--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
-+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
-@@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
- if(COMMAND add_cpplint_target)
-        add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- endif()
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index 4dda7eecd..04e1b9c3e 100644
--- a/inference-engine/samples/CMakeLists.txt
-+++ b/inference-engine/samples/CMakeLists.txt
-@@ -34,7 +34,7 @@ endif()
- 
- if(IE_MAIN_SOURCE_DIR)
-     # in case if samples are built from IE repo
-    set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
-+    set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
-     # hint for find_package(InferenceEngine in the samples folder)
-     set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
-     # hint for find_package(ngraph in the samples folder)
-@@ -122,11 +122,6 @@ set (HAVE_INTTYPES_H 1)
- set (INTTYPES_FORMAT C99)
- set (BUILD_TESTING OFF)
- 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
-    add_subdirectory(thirdparty/gflags)
-    set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
-endif()
-
- if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
- endif()
-@@ -250,6 +245,8 @@ macro(ie_add_sample)
-         add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
-                            CUSTOM_FILTERS ${custom_filters})
-     endif()
-+    
-+    install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
- endmacro()
- 
- # 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 48dbed9f2..76532fd04 100644
--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
-+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
-@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
- 
- set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
-                                                 FOLDER cpp_samples)
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index 105e666a3..5c2f70575 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -244,8 +244,8 @@ install(TARGETS ${TARGET_NAME}
- install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
-               "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
-               "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
-        DESTINATION ${IE_CPACK_IE_DIR}/share
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
-         COMPONENT core)
- install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
-        DESTINATION ${IE_CPACK_RUNTIME_PATH}
-+       DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         COMPONENT core)
-diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-index aeebe4e04..310eb6231 100644
--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
- # install
- 
- install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
-        DESTINATION ${IE_CPACK_IE_DIR}/external
-+        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
-         COMPONENT myriad)
-diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
-index d7acf8908..be4ae4a76 100644
--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
-@@ -24,4 +24,6 @@ addIeTargetTest(
-         ADD_CPPLINT
-         LABELS
-             CPU
-)
-\ No newline at end of file
-+)
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-index e4613f032..5fe9e7089 100644
--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-@@ -26,3 +26,5 @@ addIeTargetTest(
-         LABELS
-             IE
- )
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
-index a4106753d..091339e17 100644
--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
-+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
-@@ -27,4 +27,6 @@ addIeTargetTest(
-         LABELS
-             VPU
-             MYRIAD
-)
-\ No newline at end of file
-+)
-+
-+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
-index 58614d3ce..9dfa068e4 100644
--- a/inference-engine/tools/compile_tool/CMakeLists.txt
-+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
- # install
- 
- install(TARGETS compile_tool
-        RUNTIME DESTINATION deployment_tools/tools/compile_tool
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-         COMPONENT core)
- 
- install(FILES README.md
-- 
-2.26.2
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
deleted file mode 100644
index ad4d8e8a..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-cldnn-fix-inclusion-of-headers.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 74b6af221e7e2663687654e6eb2d68a5c7158af9 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Wed, 10 Jun 2020 09:50:19 +0800
-Subject: [PATCH] cldnn: fix inclusion of headers
-Upstream-Status: Inappropriate
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- inference-engine/include/gpu/gpu_ocl_wrapper.hpp                | 2 +-
- inference-engine/src/cldnn_engine/CMakeLists.txt                | 1 +
- .../thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp       | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
-index 282dcd844..0d5d4084c 100644
--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
-+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
-@@ -22,7 +22,7 @@
- # pragma GCC system_header
- #endif
- 
-#include <CL/cl2.hpp>
-+#include <cl2.hpp>
- 
- #if defined __GNUC__
- # pragma GCC diagnostic pop
-diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
-index cdc0de406..70883465b 100644
--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
-+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
-@@ -33,6 +33,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
-         ${CMAKE_CURRENT_SOURCE_DIR}
-         $<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
-         ${CLDNN__IOCL_ICD_INCDIRS}
-+        ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
-         ${CLDNN_TOP_FOLDER})
- 
- # install
-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 97608c30a..3a04096c0 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
-@@ -29,7 +29,7 @@ typedef cl_d3d11_device_set_khr    cl_device_set_intel;
- typedef cl_va_api_device_source_intel cl_device_source_intel;
- typedef cl_va_api_device_set_intel    cl_device_set_intel;
- #endif
-#include <CL/cl_intel_planar_yuv.h>
-+#include <CL/cl_ext_intel.h>
- #include "cl_intel_usm_defs.h"
- 
- #include <memory>
-- 
-2.26.2
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
deleted file mode 100644
index 864c735e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 56078933a8397b7fae146156743408319eac1ae0 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Mon, 19 Oct 2020 23:29:23 +0800
-Subject: [PATCH] demos: use gflags from meta-oe
-Upstream-Status: Inappropriate
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
- demos/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
-index e5f17231..08d4e4e6 100644
--- a/demos/CMakeLists.txt
-+++ b/demos/CMakeLists.txt
-@@ -90,11 +90,11 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
- endif()
- ####################################
- 
-set (GFLAGS_IS_SUBPROJECT TRUE)
-+set (GFLAGS_IS_SUBPROJECT FALSE)
- set (HAVE_SYS_STAT_H 1)
- set (HAVE_INTTYPES_H 1)
- 
-add_subdirectory(thirdparty/gflags)
-+#add_subdirectory(thirdparty/gflags)
- 
- if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-- 
-2.26.2
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb
deleted file mode 100644
index 82ca4af8..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository"
-HOMEPAGE = "https://github.com/opencv/open_model_zoo"
-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=git;branch=master \
-           "
-SRCREV = "75ec8ad4b6c4fd7fb161ae9d2c3056281b2443de"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-"
-inherit cmake
-S = "${WORKDIR}/git/demos"
-DEPENDS += "openvino-inference-engine opencv gflags"
-RDEPENDS_${PN} += " \
-                   python3-decorator \
-                   python3-defusedxml \
-                   python3-networkx \
-                   python3-protobuf \
-                   python3-test-generator \
-                   python3-requests \
-                   python3-pyyaml \
-"
-COMPATIBLE_HOST = '(x86_64).*-linux'
-EXTRA_OECMAKE += " \
-                 -DIE_MAIN_SOURCE_DIR=${B} \
-                 -DENABLE_SAMPLES=ON \
-                 -DIE_INCLUDE_DIR=${STAGING_EXECPREFIXDIR} \
-                 -DIE_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine.so \
-                 -DIE_C_API_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_c_api.so \
-                 -DIE_LEGACY_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_legacy.so \
-                 -DIE_NN_BUILDER_RELEASE_LIBRARY=${STAGING_LIBDIR}/libinference_engine_nn_builder.so \
-                 -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \
-"
-do_configure_prepend(){
-        mkdir -p ${WORKDIR}/InferenceEngine/share
-        cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/
-}
-do_install(){
-        install -d ${D}${libdir}
-        install -d ${D}${bindir}
-        install -d ${D}${datadir}/openvino/open-model-zoo/tools
-        install -d ${D}${datadir}/openvino/open-model-zoo/demos/python_demos
-        cp -rf ${WORKDIR}/build/intel64/Release/lib/*.a ${D}${libdir}
-        cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
-        cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
-        cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools
-        cp -rf ${WORKDIR}/git/demos/python_demos ${D}${datadir}/openvino/open-model-zoo/demos
-}
-FILES_${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb
deleted file mode 100644
index a2cc2467..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.1.bb
+++ /dev/null
@@ -1,125 +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=git;branch=releases/2021/1;lfs=0 \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2450/firmware_usb-ma2450_1381.zip;name=ma2450 \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma248x/firmware_pcie-ma248x_1381.zip;name=ma248x \
-           https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1381.zip;name=ma2x8x \
-           git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/inference-engine/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
-           file://0001-inference-engine-use-system-installed-packages.patch \
-           file://0002-cldNN-disable-Werror.patch \
-           file://0003-inference-engine-installation-fixes.patch \
-           file://0005-cldnn-fix-inclusion-of-headers.patch \
-           file://0001-dont-install-licenses-and-version-file.patch \
-           "
-SRCREV = "f557dca475cb54dcfc9026fbaad0d93ddb85015c"
-SRCREV_mkl = "6547f0b6aac2725bd4e36197e19fb1a6f2ee2f51"
-SRC_URI[ma2450.sha256sum] = "d310d60c9ab5dd8979fa03151f54c889d2fc1e4f178636f83b6756c3fee72745"
-SRC_URI[ma248x.sha256sum] = "3c6c5f365bee1b114d08c0fc8ac1e655beee9dfe05fe1508cb8079eb12975204"
-SRC_URI[ma2x8x.sha256sum] = "35389d365287055beacb3dfbc041a3b71f9c09493a942ee5d6ad03a4a2c8127a"
-LICENSE = "Apache-2.0 & ISSL & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://inference-engine/thirdparty/mkl-dnn/LICENSE;md5=afa44a3d001cc203032135324f9636b7 \
-                    file://inference-engine/thirdparty/mkl-dnn/src/cpu/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
-                    file://inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/LICENSE.txt;md5=88b295a48d2b3244ba65d3c055472c8a \
-"
-LICENSE_${PN}-vpu-firmware = "ISSL"
-inherit cmake python3native
-S = "${WORKDIR}/git"
-EXTRA_OECMAKE += " \
-                  -DENABLE_OPENCV=0 \
-                  -DENABLE_PLUGIN_RPATH=0 \
-                  -DENABLE_GNA=0 \
-                  -DPYTHON_EXECUTABLE=${PYTHON} \
-                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DTHREADING=TBB -DTBB_DIR=${STAGING_LIBDIR} \
-                  -DENABLE_SAMPLES=1 \
-                  -DIE_CPACK_IE_DIR=${prefix} \
-                  -DNGRAPH_UNIT_TEST_ENABLE=FALSE \
-                  -DNGRAPH_TEST_UTIL_ENABLE=FALSE \
-                  -DNGRAPH_ONNX_IMPORT_ENABLE=OFF \
-                  -DNGRAPH_JSON_ENABLE=FALSE \
-                  -DTREAT_WARNING_AS_ERROR=FALSE \
-                  -DENABLE_SPEECH_DEMO=FALSE \
-                  -DENABLE_DATA=FALSE \
-                  "
-DEPENDS += "libusb1 \
-            ade \
-            opencv \
-            pugixml \
-            protobuf-native \
-            tbb \
-            onednn \
-            "
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST_libc-musl = "null"
-PACKAGECONFIG ?= "vpu"
-PACKAGECONFIG[opencl] = "-DENABLE_CLDNN=1 -DCLDNN__IOCL_ICD_INCDIRS=${STAGING_INCDIR} -DCLDNN__IOCL_ICD_STLDIRS=${STAGING_LIBDIR} -DCLDNN__IOCL_ICD_SHLDIRS=${STAGING_LIBDIR}, -DENABLE_CLDNN=0, ocl-icd opencl-headers libva, intel-compute-runtime"
-PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
-PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2450_FILE=../mvnc/usb-ma2450.mvcmd -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA248X_FILE=../mvnc/pcie-ma248x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware"
-PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
-do_install_append() {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then
-        install -m0644 ${WORKDIR}/mvnc/usb-ma2450.mvcmd ${D}${libdir}/
-        install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/
-        install -m0644 ${WORKDIR}/mvnc/pcie-ma248x.mvcmd ${D}${libdir}/
-    fi
-    if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
-        install -d ${D}${datadir}/inference_engine
-        mv ${D}/usr/samples/python ${D}${datadir}/inference_engine/
-        install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-        mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
-        mv ${D}${prefix}/deployment_tools/tools/benchmark_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
-        mv ${D}${prefix}/deployment_tools/tools/cross_check_tool ${D}${PYTHON_SITEPACKAGES_DIR}/openvino/
-        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
-}
-# 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}/inference_engine \
-                       ${bindir} \
-                       "
-FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd"
-# Package for inference engine python API
-PACKAGES =+ "${PN}-${PYTHON_PN}"
-FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino"