summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch51
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch128
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0439.bb)14
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch296
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch348
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch19
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch27
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb54
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb149
9 files changed, 34 insertions, 1052 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
index 7fede93c..8a734ed2 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -1,27 +1,29 @@
1 1Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
2 builds
2Upstream-Status: Backport 3Upstream-Status: Backport
3Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 4Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
4 5---
5 MdePkg/Include/Base.h | 12 ++++++++++++ 6 MdePkg/Include/Base.h | 12 ++++++++++++
6 1 file changed, 12 insertions(+) 7 1 file changed, 12 insertions(+)
7 8
8diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h 9Index: edk2/MdePkg/Include/Base.h
9index 2da08b0c78..072eefdb94 100644 10===================================================================
10--- a/MdePkg/Include/Base.h 11--- edk2.orig/MdePkg/Include/Base.h
11+++ b/MdePkg/Include/Base.h 12+++ edk2/MdePkg/Include/Base.h
12@@ -318,7 +318,11 @@ struct _LIST_ENTRY { 13@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
13 /// 14 #define NULL __null
14 /// NULL pointer (VOID *) 15 #endif
15 /// 16 #else
16+#ifndef OS_BUILD 17+#ifndef OS_BUILD
17+#ifndef UNIT_TEST_UEFI_BUILD 18+#ifndef UNIT_TEST_UEFI_BUILD
18 #define NULL ((VOID *) 0) 19 #define NULL ((VOID *) 0)
20 #endif
19+#endif 21+#endif
20+#endif 22+#endif
21 23
22 // 24 //
23 // Null character 25 // Null character
24@@ -810,6 +814,8 @@ typedef UINTN *BASE_LIST; 26@@ -813,6 +817,8 @@ typedef UINTN *BASE_LIST;
25 // Section 2.3.1 of the UEFI 2.3 Specification. 27 // Section 2.3.1 of the UEFI 2.3 Specification.
26 // 28 //
27 29
@@ -30,28 +32,31 @@ index 2da08b0c78..072eefdb94 100644
30 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); 32 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
31 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); 33 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
32 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); 34 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
33@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi 35@@ -841,7 +847,8 @@ STATIC_ASSERT (ALIGNOF (CHAR16) == size
34 STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); 36 STATIC_ASSERT (ALIGNOF (INTN) == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements");
35 STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); 37 STATIC_ASSERT (ALIGNOF (UINTN) == sizeof (UINTN), "Alignment of UINTN does not meet UEFI Specification Data Type requirements");
36 STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); 38 STATIC_ASSERT (ALIGNOF (VOID *) == sizeof (VOID *), "Alignment of VOID * does not meet UEFI Specification Data Type requirements");
39-
37+#endif 40+#endif
38+#endif 41+#endif
39
40 // 42 //
41 // The following three enum types are used to verify that the compiler 43 // The following three enum types are used to verify that the compiler
42@@ -843,9 +851,13 @@ typedef enum { 44 // configuration for enum types is compliant with Section 2.3.1 of the
43 __VerifyUint32EnumValue = 0xffffffff 45@@ -861,6 +868,8 @@ typedef enum {
44 } __VERIFY_UINT32_ENUM_SIZE; 46 __VerifyInt32EnumValue = 0x7fffffff
47 } __VERIFY_INT32_ENUM_SIZE;
45 48
46+#ifndef OS_BUILD 49+#ifndef OS_BUILD
47+#ifndef UNIT_TEST_UEFI_BUILD 50+#ifndef UNIT_TEST_UEFI_BUILD
48 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); 51 STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
49 STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); 52 STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
50 STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); 53 STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
54@@ -868,6 +877,8 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_EN
55 STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE) == sizeof (__VERIFY_UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
56 STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) == sizeof (__VERIFY_UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
57 STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
51+#endif 58+#endif
52+#endif 59+#endif
53 60
54 /** 61 /**
55 Macro that returns a pointer to the data structure that contains a specified field of 62 Macro that returns a pointer to the data structure that contains a specified field of
56--
572.31.0.windows.1
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch
deleted file mode 100644
index a6e83617..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch
+++ /dev/null
@@ -1,128 +0,0 @@
1From 227d9cb35658fe104ff6fde62e4a00e6d595df0d Mon Sep 17 00:00:00 2001
2From: Adam Borowski <kilobyte@angband.pl>
3Date: Sat, 25 Jun 2022 20:35:35 +0200
4Subject: [PATCH] Drop unused queries for block size, fixing build with new
5 kernels
6
7Quoting Linux commit f8669f1d6a86a6b17104ceca9340ded280307ac1:
8
9> Block Aperture Window support was an attempt to layer an error model
10> over PMEM for platforms that did not support machine-check-recovery.
11> However, it was abandoned before it ever shipped, and only ever existed
12> in the ACPI specification. Meanwhile Linux has carried a large pile of
13> dead code for non-shipping infrastructure. [...]
14
15We fetched block sizes but never used that info for anything. Now that
16the required defines have been dropped in kernel 5.18, let's purge that
17code.
18
19Signed-off-by: Adam Borowski <adam.borowski@intel.com>
20
21Upstream-Status: Submitted
22Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
23---
24 src/os/linux/lnx_system.c | 56 ---------------------------------------
25 src/os/os.h | 2 --
26 src/os/win/win_system.c | 2 --
27 3 files changed, 60 deletions(-)
28
29diff --git a/src/os/linux/lnx_system.c b/src/os/linux/lnx_system.c
30index a2903d8b..d2ad3c1f 100644
31--- a/src/os/linux/lnx_system.c
32+++ b/src/os/linux/lnx_system.c
33@@ -315,61 +315,6 @@ int os_get_os_type()
34 return OS_TYPE_LINUX;
35 }
36
37-int get_supported_block_sizes(struct nvm_driver_capabilities *p_capabilities)
38-{
39- int rc = NVM_SUCCESS;
40- int found = 0;
41- struct ndctl_ctx *ctx;
42-
43- p_capabilities->num_block_sizes = 0;
44-
45- if ((rc = ndctl_new(&ctx)) >= 0)
46- {
47- struct ndctl_bus *bus;
48- ndctl_bus_foreach(ctx, bus)
49- {
50- struct ndctl_region *region;
51- ndctl_region_foreach(bus, region)
52- {
53- int nstype = ndctl_region_get_nstype(region);
54- if (ndctl_region_is_enabled(region) &&
55- (nstype == ND_DEVICE_NAMESPACE_BLK))
56- {
57- struct ndctl_namespace *namespace;
58- ndctl_namespace_foreach(region, namespace)
59- {
60- p_capabilities->num_block_sizes =
61- ndctl_namespace_get_num_sector_sizes(namespace);
62-
63- for (int i = 0; i < p_capabilities->num_block_sizes; i++)
64- {
65- p_capabilities->block_sizes[i] =
66- ndctl_namespace_get_supported_sector_size(namespace, i);
67- }
68- found = 1;
69- break;
70- }
71- }
72- if (found)
73- {
74- break;
75- }
76- }
77- if (found)
78- {
79- break;
80- }
81- }
82- ndctl_unref(ctx);
83- }
84- else
85- {
86- rc = linux_err_to_nvm_lib_err(rc);
87- }
88-
89- return rc;
90-}
91-
92 int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
93 {
94 p_capabilities->features.get_platform_capabilities = 1;
95@@ -399,7 +344,6 @@ int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
96 p_capabilities->features.app_direct_mode = 1;
97
98 p_capabilities->min_namespace_size = ndctl_min_namespace_size();
99- get_supported_block_sizes(p_capabilities);
100 p_capabilities->namespace_memory_page_allocation_capable = 1;
101 return 0;
102 }
103diff --git a/src/os/os.h b/src/os/os.h
104index 736904de..e5a08bcd 100644
105--- a/src/os/os.h
106+++ b/src/os/os.h
107@@ -66,8 +66,6 @@ struct driver_feature_flags
108
109 struct nvm_driver_capabilities
110 {
111- unsigned int block_sizes[MAX_NUMBER_OF_BLOCK_SIZES]; // in bytes
112- unsigned int num_block_sizes;
113 unsigned long long min_namespace_size; // in bytes
114 unsigned int namespace_memory_page_allocation_capable;
115 struct driver_feature_flags features;
116diff --git a/src/os/win/win_system.c b/src/os/win/win_system.c
117index 0c18cf0e..4d840333 100644
118--- a/src/os/win/win_system.c
119+++ b/src/os/win/win_system.c
120@@ -830,8 +830,6 @@ int os_get_driver_capabilities(struct nvm_driver_capabilities *p_capabilities)
121 memset(p_capabilities, 0, sizeof(struct nvm_driver_capabilities));
122
123 p_capabilities->min_namespace_size = BYTES_PER_GIB;
124- p_capabilities->num_block_sizes = 1;
125- p_capabilities->block_sizes[0] = 1;
126
127 p_capabilities->namespace_memory_page_allocation_capable = 0;
128 p_capabilities->features.get_platform_capabilities = 1;
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0439.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
index 7bf0cb70..7b95ffe4 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0439.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0499.bb
@@ -15,18 +15,16 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause"
15LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ 15LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \
16 file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" 16 file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
17 17
18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ 18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master_3_0;name=ipmctl; \
19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \ 19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/edk2;branch=master \
20 file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ 20 file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
21 file://0001-CMakeLists-disable-Werror.patch \ 21 file://0001-CMakeLists-disable-Werror.patch \
22 file://227d9cb35658fe104ff6fde62e4a00e6d595df0d.patch \
23" 22"
24 23
25SRCREV_ipmctl = "8a73a975e2501c9baa6e4b1fb9101b40a227d084" 24SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
26#tag edk2-stable202205 25#tag edk2-stable202408
27SRCREV_edk2 = "16779ede2d366bfc6b702e817356ccf43425bcc8" 26SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201"
28 27SRCREV_FORMAT = "ipmctl_edk2"
29S = "${WORKDIR}/git"
30 28
31inherit cmake dos2unix 29inherit cmake dos2unix
32 30
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 315385d8..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,296 +0,0 @@
1From b0f30ab7ecdac98afa72a31371a393a73f855b3c Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 7 Apr 2022 21:39:26 +0800
4Subject: [PATCH] Use system installed dependencies
5
6Use the system versions of libva, tbb, OpenCV, ade and zlib.
7
8Upstream-Status: Inappropriate
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
11---
12 cmake/dependencies.cmake | 75 -------------------------
13 cmake/extra_modules.cmake | 4 +-
14 cmake/templates/OpenVINOConfig.cmake.in | 9 ---
15 src/cmake/ie_parallel.cmake | 2 +-
16 src/plugins/intel_gpu/include/va/va.h | 6 --
17 tests/fuzz/src/CMakeLists.txt | 3 +-
18 thirdparty/CMakeLists.txt | 26 ++++-----
19 thirdparty/cnpy/CMakeLists.txt | 2 +-
20 8 files changed, 15 insertions(+), 112 deletions(-)
21 delete mode 100644 src/plugins/intel_gpu/include/va/va.h
22
23diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
24index e2f941fcd..1fcc358ef 100644
25--- a/cmake/dependencies.cmake
26+++ b/cmake/dependencies.cmake
27@@ -29,26 +29,6 @@ endif()
28
29 if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
30 set(protoc_version "3.18.2")
31-
32- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
33- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
34- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
35- SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21"
36- )
37- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
38-
39- reset_deps_cache(SYSTEM_PROTOC)
40-
41- find_host_program(
42- SYSTEM_PROTOC
43- NAMES protoc
44- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
45- NO_DEFAULT_PATH)
46- if(NOT SYSTEM_PROTOC)
47- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
48- endif()
49-
50- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
51 endif()
52
53 if(ENABLE_INTEL_MYRIAD)
54@@ -102,61 +82,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
55 set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}")
56 endif()
57
58- if(WIN32 AND X86_64)
59- # TODO: add target_path to be platform specific as well, to avoid following if
60- RESOLVE_DEPENDENCY(TBB
61- ARCHIVE_WIN "tbb2020_20200415_win.zip"
62- TARGET_PATH "${TEMP}/tbb"
63- ENVIRONMENT "TBBROOT"
64- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
65- if(ENABLE_TBBBIND_2_5)
66- RESOLVE_DEPENDENCY(TBBBIND_2_5
67- ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip"
68- TARGET_PATH "${TEMP}/tbbbind_2_5"
69- ENVIRONMENT "TBBBIND_2_5_ROOT"
70- SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1")
71- else()
72- message(WARNING "prebuilt TBBBIND_2_5 is not available.
73- Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
74- endif()
75- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
76- RESOLVE_DEPENDENCY(TBB
77- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
78- TARGET_PATH "${TEMP}/tbb"
79- ENVIRONMENT "TBBROOT"
80- SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
81- elseif(LINUX AND X86_64)
82- RESOLVE_DEPENDENCY(TBB
83- ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
84- TARGET_PATH "${TEMP}/tbb"
85- ENVIRONMENT "TBBROOT"
86- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
87- if(ENABLE_TBBBIND_2_5)
88- RESOLVE_DEPENDENCY(TBBBIND_2_5
89- ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"
90- TARGET_PATH "${TEMP}/tbbbind_2_5"
91- ENVIRONMENT "TBBBIND_2_5_ROOT"
92- SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4")
93- else()
94- message(WARNING "prebuilt TBBBIND_2_5 is not available.
95- Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure")
96- endif()
97- elseif(LINUX AND AARCH64)
98- RESOLVE_DEPENDENCY(TBB
99- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
100- TARGET_PATH "${TEMP}/tbb_yocto"
101- ENVIRONMENT "TBBROOT"
102- SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
103- elseif(APPLE AND X86_64)
104- RESOLVE_DEPENDENCY(TBB
105- ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
106- TARGET_PATH "${TEMP}/tbb"
107- ENVIRONMENT "TBBROOT"
108- SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
109- else()
110- message(FATAL_ERROR "TBB is not available on current platform")
111- endif()
112-
113 update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
114 if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake")
115 # oneTBB case
116diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake
117index e33e4378f..f0cacdf6f 100644
118--- a/cmake/extra_modules.cmake
119+++ b/cmake/extra_modules.cmake
120@@ -18,7 +18,7 @@ function(ie_generate_dev_package_config)
121 configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
122 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
123 INSTALL_DESTINATION share # not used
124- PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
125+ PATH_VARS "OpenVINO_SOURCE_DIR"
126 NO_CHECK_REQUIRED_COMPONENTS_MACRO)
127
128 configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
129@@ -45,7 +45,7 @@ function(ov_generate_dev_package_config)
130 configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in"
131 "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake"
132 INSTALL_DESTINATION share # not used
133- PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
134+ PATH_VARS "OpenVINO_SOURCE_DIR"
135 NO_CHECK_REQUIRED_COMPONENTS_MACRO)
136
137 configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in"
138diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in
139index 00e892f2b..7c686fa07 100644
140--- a/cmake/templates/OpenVINOConfig.cmake.in
141+++ b/cmake/templates/OpenVINOConfig.cmake.in
142@@ -146,15 +146,6 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}")
143
144 set(THREADING "@THREADING@")
145 if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND)
146- set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
147- _ov_find_dependency(TBB
148- COMPONENTS tbb tbbmalloc
149- CONFIG
150- PATHS ${TBBROOT}/cmake
151- ${_tbb_dir}
152- NO_CMAKE_FIND_ROOT_PATH
153- NO_DEFAULT_PATH)
154-
155 set(install_tbbbind "@install_tbbbind@")
156 if(install_tbbbind)
157 set_and_check(_tbb_bind_dir "@PACKAGE_IE_TBBBIND_DIR@")
158diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake
159index a036b019c..031f1ea48 100644
160--- a/src/cmake/ie_parallel.cmake
161+++ b/src/cmake/ie_parallel.cmake
162@@ -34,7 +34,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
163 endforeach()
164 endif()
165 set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE)
166- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
167+ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE)
168 set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE)
169 if (NOT TBB_FOUND)
170 set(THREADING "SEQ" PARENT_SCOPE)
171diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
172deleted file mode 100644
173index 5c8a5c6f6..000000000
174--- a/src/plugins/intel_gpu/include/va/va.h
175+++ /dev/null
176@@ -1,6 +0,0 @@
177-// Copyright (C) 2018-2022 Intel Corporation
178-// SPDX-License-Identifier: Apache-2.0
179-//
180-
181-typedef cl_uint VASurfaceID;
182-typedef void* VADisplay;
183diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt
184index 5e6b7b168..a81c51bb7 100644
185--- a/tests/fuzz/src/CMakeLists.txt
186+++ b/tests/fuzz/src/CMakeLists.txt
187@@ -10,14 +10,13 @@ add_custom_target(fuzz)
188 FILE(GLOB tests "*-fuzzer.cc")
189
190 add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy)
191-add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
192
193 foreach(test_source ${tests})
194 get_filename_component(test_name ${test_source} NAME_WE)
195 add_fuzzer(${test_name} ${test_source})
196
197 target_link_libraries(${test_name} PRIVATE
198- openvino::runtime cnpy zlib)
199+ openvino::runtime cnpy z)
200
201 add_dependencies(fuzz ${test_name})
202
203diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
204index 2d61c5fd7..97b372998 100644
205--- a/thirdparty/CMakeLists.txt
206+++ b/thirdparty/CMakeLists.txt
207@@ -12,10 +12,9 @@ endif()
208
209 add_subdirectory(ittapi)
210 add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
211-add_subdirectory(zlib EXCLUDE_FROM_ALL)
212 add_subdirectory(cnpy EXCLUDE_FROM_ALL)
213 if(ENABLE_INTEL_GPU)
214- add_subdirectory(ocl)
215+ #add_subdirectory(ocl)
216 endif()
217
218 add_subdirectory(xbyak EXCLUDE_FROM_ALL)
219@@ -52,21 +51,16 @@ endif()
220 add_library(ocv_hal INTERFACE)
221 target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv")
222
223-add_subdirectory(ade EXCLUDE_FROM_ALL)
224 add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL)
225-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
226-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
227+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
228+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
229
230-ov_install_static_lib(ade openvino_common)
231 ov_install_static_lib(fluid openvino_common)
232
233 #
234 # Gflags
235 #
236
237-add_subdirectory(gflags EXCLUDE_FROM_ALL)
238-openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
239-
240 #
241 # Google Tests framework
242 #
243@@ -89,13 +83,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
244 set(Protobuf_DEBUG ON)
245 endif()
246 find_package(Protobuf 3.18.2 REQUIRED)
247- set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
248- set(Protobuf_LIBRARIES protobuf::libprotobuf)
249- set(SYSTEM_PROTOC protobuf::protoc)
250+ set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
251+ set(Protobuf_LIBRARIES protobuf::libprotobuf)
252+ #set(SYSTEM_PROTOC protobuf::protoc)
253 set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC})
254
255 foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES})
256- set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
257+ #set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE)
258 endforeach()
259 else()
260 add_subdirectory(protobuf EXCLUDE_FROM_ALL)
261@@ -104,8 +98,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
262 # forward variables used in the other places
263 set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE)
264 set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE)
265- set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE)
266- set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE)
267+ set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE)
268+ set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE)
269 set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE)
270 set(Protobuf_IN_FRONTEND ON PARENT_SCOPE)
271
272@@ -116,7 +110,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
273 set(link_type INTERFACE)
274 endif()
275 if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
276- target_compile_options(${target} ${link_type} -Wno-undef)
277+ #target_compile_options(${target} ${link_type} -Wno-undef)
278 endif()
279 endforeach()
280 endif()
281diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
282index 041031e92..793de9845 100644
283--- a/thirdparty/cnpy/CMakeLists.txt
284+++ b/thirdparty/cnpy/CMakeLists.txt
285@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
286 PRIVATE -Wno-all)
287 endif()
288
289-target_link_libraries(${TARGET_NAME} PUBLIC zlib)
290+target_link_libraries(${TARGET_NAME} PUBLIC z)
291 target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
292
293 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)
294--
2952.35.1
296
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch
deleted file mode 100644
index 9e2b46fd..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,348 +0,0 @@
1From 07772636ef9b7207967395d22a869e204e8f485b Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Mon, 11 Apr 2022 11:11:23 +0800
4Subject: [PATCH] Fix installation of binaries and libraries
5
6Make sure binaries are installed correctly.
7
8Upstream-Status: Inappropriate
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 CMakeLists.txt | 2 +-
13 cmake/developer_package/frontends/frontends.cmake | 2 +-
14 cmake/developer_package/packaging.cmake | 4 ++--
15 cmake/developer_package/plugins/plugins.cmake | 2 +-
16 docs/CMakeLists.txt | 3 ++-
17 samples/CMakeLists.txt | 2 +-
18 samples/c/common/opencv_c_wrapper/CMakeLists.txt | 2 ++
19 samples/cpp/CMakeLists.txt | 2 ++
20 scripts/CMakeLists.txt | 10 +++++-----
21 src/bindings/c/src/CMakeLists.txt | 4 ++--
22 src/cmake/openvino.cmake | 12 ++++++------
23 src/common/preprocessing/CMakeLists.txt | 2 +-
24 src/core/CMakeLists.txt | 4 ++--
25 src/inference/CMakeLists.txt | 2 +-
26 .../intel_gpu/src/kernel_selector/CMakeLists.txt | 2 +-
27 src/plugins/intel_myriad/myriad_dependencies.cmake | 2 +-
28 .../intel_myriad/myriad_plugin/CMakeLists.txt | 2 +-
29 tools/CMakeLists.txt | 2 +-
30 tools/compile_tool/CMakeLists.txt | 8 ++++----
31 19 files changed, 37 insertions(+), 32 deletions(-)
32
33diff --git a/CMakeLists.txt b/CMakeLists.txt
34index fe62c6318..344d9398f 100644
35--- a/CMakeLists.txt
36+++ b/CMakeLists.txt
37@@ -104,7 +104,7 @@ include(cmake/extra_modules.cmake)
38 add_subdirectory(docs)
39 add_subdirectory(tools)
40 add_subdirectory(scripts)
41-add_subdirectory(licensing)
42+#add_subdirectory(licensing)
43
44 #
45 # CPack
46diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
47index 39b23fe65..aa638c077 100644
48--- a/cmake/developer_package/frontends/frontends.cmake
49+++ b/cmake/developer_package/frontends/frontends.cmake
50@@ -2,7 +2,7 @@
51 # SPDX-License-Identifier: Apache-2.0
52 #
53
54-set(FRONTEND_INSTALL_INCLUDE "runtime/include/")
55+set(FRONTEND_INSTALL_INCLUDE "include/")
56 set(FRONTEND_NAME_PREFIX "openvino_")
57 set(FRONTEND_NAME_SUFFIX "_frontend")
58
59diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
60index cc287ff1f..2daee6611 100644
61--- a/cmake/developer_package/packaging.cmake
62+++ b/cmake/developer_package/packaging.cmake
63@@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir)
64 set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
65 set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
66 else()
67- set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
68- set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
69+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
70+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
71 set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
72 endif()
73 endfunction()
74diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
75index a630d6c35..779c43631 100644
76--- a/cmake/developer_package/plugins/plugins.cmake
77+++ b/cmake/developer_package/plugins/plugins.cmake
78@@ -138,7 +138,7 @@ function(ie_add_plugin)
79
80 if(BUILD_SHARED_LIBS)
81 install(TARGETS ${IE_PLUGIN_NAME}
82- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
83+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH}
84 COMPONENT ${install_component})
85 else()
86 ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component})
87diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
88index 86b0e8652..4f31d3cc4 100644
89--- a/docs/CMakeLists.txt
90+++ b/docs/CMakeLists.txt
91@@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER)
92 foreach(target openvino_template_plugin template_extension openvino_template_extension)
93 if(TARGET ${target})
94 install(TARGETS ${target}
95- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
96+ LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH}
97 COMPONENT tests
98 EXCLUDE_FROM_ALL)
99+ install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
100 endif()
101 endforeach()
102 endif()
103diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
104index 8101b5e32..6abe8c20c 100644
105--- a/samples/CMakeLists.txt
106+++ b/samples/CMakeLists.txt
107@@ -9,7 +9,7 @@ add_subdirectory(c)
108 if(TARGET format_reader)
109 install(TARGETS format_reader
110 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL
111- LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
112+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests)
113 endif()
114
115 openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
116diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
117index a8e6e5172..aa3d2fe0e 100644
118--- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt
119+++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt
120@@ -34,3 +34,5 @@ install(
121 RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
122 LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL
123 )
124+
125+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
126diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
127index 3433dee0e..0c0fa0723 100644
128--- a/samples/cpp/CMakeLists.txt
129+++ b/samples/cpp/CMakeLists.txt
130@@ -222,6 +222,8 @@ macro(ie_add_sample)
131 EXCLUDE_FROM_ALL
132 )
133
134+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
135+
136 # create global target with all samples / demo apps
137 if(NOT TARGET ie_samples)
138 add_custom_target(ie_samples ALL)
139diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
140index 9ad26ba95..0853e2370 100644
141--- a/scripts/CMakeLists.txt
142+++ b/scripts/CMakeLists.txt
143@@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
144
145 # install setupvars
146
147-ie_cpack_add_component(setupvars REQUIRED)
148+#ie_cpack_add_component(setupvars REQUIRED)
149
150 if(UNIX)
151 set(_setupvars_file setupvars/setupvars.sh)
152@@ -43,13 +43,13 @@ elseif(WIN32)
153 file(WRITE "${_setupvars_file}" "${_setupvars_content}")
154 endif()
155 endif()
156-install(PROGRAMS "${_setupvars_file}"
157- DESTINATION .
158- COMPONENT setupvars)
159+#install(PROGRAMS "${_setupvars_file}"
160+# DESTINATION .
161+# COMPONENT setupvars)
162
163 # install install_dependencies
164
165-if(LINUX)
166+if (FALSE)
167 ie_cpack_add_component(install_dependencies REQUIRED)
168 install(DIRECTORY install_dependencies/
169 DESTINATION install_dependencies
170diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt
171index 9200d0bda..b3636e071 100644
172--- a/src/bindings/c/src/CMakeLists.txt
173+++ b/src/bindings/c/src/CMakeLists.txt
174@@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
175 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c
176 ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c
177 LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c
178- INCLUDES DESTINATION runtime/include/ie)
179+ INCLUDES DESTINATION include/ie)
180
181 install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/
182- DESTINATION runtime/include/ie
183+ DESTINATION include/ie
184 COMPONENT core_c_dev)
185diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake
186index c46548468..3d65a20a5 100644
187--- a/src/cmake/openvino.cmake
188+++ b/src/cmake/openvino.cmake
189@@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
190 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
191 ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
192 LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
193- INCLUDES DESTINATION runtime/include
194- runtime/include/ie)
195+ INCLUDES DESTINATION include
196+ include/ie)
197
198 # --------------- OpenVINO runtime library dev ------------------------------
199 add_library(${TARGET_NAME}_dev INTERFACE)
200@@ -96,7 +96,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components})
201
202 if(BUILD_SHARED_LIBS)
203 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
204- DESTINATION ${IE_CPACK_RUNTIME_PATH}
205+ DESTINATION ${IE_CPACK_LIBRARY_PATH}
206 COMPONENT core)
207
208 # for InferenceEngineUnitTest
209@@ -115,7 +115,7 @@ endif()
210 install(EXPORT OpenVINOTargets
211 FILE OpenVINOTargets.cmake
212 NAMESPACE openvino::
213- DESTINATION runtime/cmake
214+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
215 COMPONENT core_dev)
216
217 set(OV_CORE_DIR "${CMAKE_BINARY_DIR}/src/core")
218@@ -161,10 +161,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm
219 install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
220 "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
221 "${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake"
222- DESTINATION runtime/cmake
223+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
224 COMPONENT core_dev)
225
226 install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake"
227 "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake"
228- DESTINATION runtime/cmake
229+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO
230 COMPONENT core_dev)
231diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt
232index e41e286c9..11aaffca6 100644
233--- a/src/common/preprocessing/CMakeLists.txt
234+++ b/src/common/preprocessing/CMakeLists.txt
235@@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
236
237 if(BUILD_SHARED_LIBS)
238 install(TARGETS ${TARGET_NAME}
239- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
240+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
241 else()
242 ov_install_static_lib(${TARGET_NAME} core)
243 endif()
244diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
245index cc64b94ca..5f0dcf20c 100644
246--- a/src/core/CMakeLists.txt
247+++ b/src/core/CMakeLists.txt
248@@ -114,7 +114,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_
249 #-----------------------------------------------------------------------------------------------
250
251 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
252- DESTINATION "runtime/include"
253+ DESTINATION "include"
254 COMPONENT core_dev
255 FILES_MATCHING
256 PATTERN "*.hpp"
257@@ -130,5 +130,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
258
259 install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake
260 ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake
261- DESTINATION "runtime/cmake"
262+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
263 COMPONENT core_dev)
264diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt
265index ddd2fdcbc..f4ad1e623 100644
266--- a/src/inference/CMakeLists.txt
267+++ b/src/inference/CMakeLists.txt
268@@ -204,7 +204,7 @@ set_target_properties(${TARGET_NAME}_obj
269
270 openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api)
271
272-install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include
273+install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include
274 COMPONENT core_dev)
275
276 # Install static libraries for case BUILD_SHARED_LIBS=OFF
277diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
278index 3993bd973..99287bad5 100644
279--- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
280+++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt
281@@ -94,7 +94,7 @@ add_custom_command(
282 COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json)
283
284 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json
285- DESTINATION ${IE_CPACK_RUNTIME_PATH}
286+ DESTINATION ${IE_CPACK_LIBRARY_PATH}
287 COMPONENT gpu)
288
289 ov_install_static_lib(${TARGET_NAME} gpu)
290diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake
291index 5bba4235f..69c1470a7 100644
292--- a/src/plugins/intel_myriad/myriad_dependencies.cmake
293+++ b/src/plugins/intel_myriad/myriad_dependencies.cmake
294@@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES)
295 VERBATIM)
296
297 install(FILES ${${var_name}}
298- DESTINATION ${IE_CPACK_RUNTIME_PATH}
299+ DESTINATION ${IE_CPACK_LIBRARY_PATH}
300 COMPONENT myriad)
301
302 if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS)
303diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
304index 12a2f15e4..893146294 100644
305--- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
306+++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt
307@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
308 # install
309 if (LINUX)
310 install(FILES ${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/third_party/mvnc/src/97-myriad-usbboot.rules
311- DESTINATION runtime/3rdparty
312+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
313 COMPONENT myriad)
314 endif()
315diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
316index c8638f7fd..ba30641c5 100644
317--- a/tools/CMakeLists.txt
318+++ b/tools/CMakeLists.txt
319@@ -20,7 +20,7 @@ endif()
320 ie_cpack_add_component(deployment_manager REQUIRED)
321
322 install(DIRECTORY deployment_manager
323- DESTINATION tools
324+ DESTINATION share/openvino/tools
325 COMPONENT deployment_manager
326 USE_SOURCE_PERMISSIONS)
327
328diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt
329index d19eb5cc1..9fc929cbb 100644
330--- a/tools/compile_tool/CMakeLists.txt
331+++ b/tools/compile_tool/CMakeLists.txt
332@@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
333 ie_cpack_add_component(core_tools DEPENDS core)
334
335 install(TARGETS compile_tool
336- RUNTIME DESTINATION tools/compile_tool
337+ RUNTIME DESTINATION bin
338 COMPONENT core_tools)
339
340-install(FILES README.md
341- DESTINATION tools/compile_tool
342- COMPONENT core_tools)
343+#install(FILES README.md
344+# DESTINATION tools/compile_tool
345+# COMPONENT core_tools)
346--
3472.35.1
348
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch
deleted file mode 100644
index 45ed0d27..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Change the working directory to source to workaround cython
2embedding absolute path to the pyx file in output.
3
4Upstream-Status: Inappropriate [OE build specific]
5Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
6
7diff --git a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
8index f14662ad50..8d199fe328 100644
9--- a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
10+++ b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake
11@@ -259,7 +259,7 @@ function( compile_pyx _name generated_file )
12 add_custom_command( OUTPUT ${_generated_file}
13 COMMAND ${CYTHON_EXECUTABLE}
14 ARGS ${cxx_arg} ${include_directory_arg} ${version_arg}
15- ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS}
16+ ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} -w ${CMAKE_CURRENT_SOURCE_DIR}
17 --output-file ${_generated_file} ${pyx_locations}
18 DEPENDS ${pyx_locations} ${pxd_dependencies} ${pxi_dependencies}
19 IMPLICIT_DEPENDS ${pyx_lang} ${c_header_dependencies}
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
deleted file mode 100644
index 3db0a31e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From e071d6a6323f04dc7e6e40047199e509536d7f6e Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Mon, 30 Aug 2021 17:54:17 +0800
4Subject: [PATCH] demos: use gflags from meta-oe
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
10
11---
12 demos/CMakeLists.txt | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
16index 98de0db6c..077d43fb4 100644
17--- a/demos/CMakeLists.txt
18+++ b/demos/CMakeLists.txt
19@@ -140,7 +140,7 @@ endmacro()
20 find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs gapi)
21 find_package(OpenVINO REQUIRED COMPONENTS Runtime)
22
23-add_subdirectory(thirdparty/gflags)
24+#add_subdirectory(thirdparty/gflags)
25 add_subdirectory(common/cpp)
26 add_subdirectory(common/cpp_gapi)
27 add_subdirectory(multi_channel_common/cpp)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb
deleted file mode 100644
index d21b2968..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2022.1.bb
+++ /dev/null
@@ -1,54 +0,0 @@
1SUMMARY = "OpenVINO(TM) Toolkit - Open Model Zoo repository"
2HOMEPAGE = "https://github.com/opencv/open_model_zoo"
3DESCRIPTION = "This repository includes optimized deep learning \
4models and a set of demos to expedite development of high-performance \
5deep learning inference applications."
6
7SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=releases/2022/1 \
8 file://0001-use-oe-gflags.patch \
9 "
10
11SRCREV = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1"
12
13LICENSE = "Apache-2.0"
14LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
15"
16
17inherit cmake
18
19S = "${WORKDIR}/git"
20OECMAKE_SOURCEPATH = "${S}/demos"
21
22DEPENDS += "openvino-inference-engine opencv gflags"
23
24RDEPENDS:${PN} += " \
25 python3-decorator \
26 python3-defusedxml \
27 python3-networkx \
28 python3-protobuf \
29 python3-requests \
30 python3-pyyaml \
31 python3-numpy \
32 bash \
33"
34
35COMPATIBLE_HOST = '(x86_64).*-linux'
36COMPATIBLE_HOST:libc-musl = "null"
37
38EXTRA_OECMAKE += " \
39 -DENABLE_SAMPLES=ON \
40 "
41
42do_install(){
43 install -d ${D}${libdir}
44 install -d ${D}${bindir}
45 install -d ${D}${datadir}/openvino/open-model-zoo/tools
46 install -d ${D}${datadir}/openvino/open-model-zoo/demos
47 cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir}
48 cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir}
49 cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo
50 cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo
51 cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools
52}
53
54FILES:${PN} += "${datadir}/openvino"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb
deleted file mode 100644
index e4b0414b..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.1.bb
+++ /dev/null
@@ -1,149 +0,0 @@
1SUMMARY = "OpenVINO(TM) Toolkit - Deep Learning Deployment Toolkit"
2HOMEPAGE = "https://github.com/opencv/dldt"
3DESCRIPTION = "This toolkit allows developers to deploy pre-trained \
4deep learning models through a high-level C++ Inference Engine API \
5integrated with application logic."
6
7SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2022/1;lfs=0 \
8 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/usb-ma2x8x/firmware_usb-ma2x8x_1875.zip;name=usb_ma2x8x \
9 https://download.01.org/opencv/master/openvinotoolkit/thirdparty/unified/VPU/pcie-ma2x8x/firmware_pcie-ma2x8x_1875.zip;name=pcie_ma2x8x \
10 git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mkl-dnn;name=mkl;nobranch=1 \
11 git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;branch=master \
12 git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \
13 git://github.com/pybind/pybind11.git;protocol=https;destsuffix=git/src/bindings/python/thirdparty/pybind11;name=pybind11;branch=master \
14 git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.18.x \
15 git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=master \
16 git://github.com/pboettch/json-schema-validator.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json_schema_validator;name=jsonschema;branch=main \
17 git://github.com/openvinotoolkit/open_model_zoo.git;protocol=https;destsuffix=git/thirdparty/open_model_zoo;name=omz;branch=releases/2022/1 \
18 file://0001-inference-engine-use-system-installed-packages.patch \
19 file://0002-inference-engine-installation-fixes.patch \
20 file://cython-cmake.patch \
21 "
22
23SRCREV = "cdb9bec7210f8c24fde3e416c7ada820faaaa23e"
24SRCREV_mkl = "82ca2f931c1d588b67d154d873136d4af1ffb3a8"
25SRCREV_onednn = "9e2bf22e51726ad36ddae90c7caf2898d124baa6"
26SRCREV_xbyak = "8d1e41b650890080fb77548372b6236bbd4079f9"
27SRCREV_pybind11 = "d71ba0cb73616c493d35699a8a9283aa64ef0f6b"
28SRCREV_protobuf = "6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea"
29SRCREV_json = "fec56a1a16c6e1c1b1f4e116a20e79398282626c"
30SRCREV_jsonschema = "b1ef8628326cf0b53612f12784fd245e5e4382f1"
31SRCREV_omz = "cf9003a95ddb742aabea341aa1573c3fa25ebbe1"
32
33SRC_URI[usb_ma2x8x.sha256sum] = "e65fcc1c6b0f3e9d814e53022c212ec0a2b83197a9df38badb298fb85ccf3acf"
34SRC_URI[pcie_ma2x8x.sha256sum] = "b11368fec2036d96fb703d2a40b171184fefe89f27e74a988ef1ca34260a2bc5"
35
36LICENSE = "Apache-2.0 & MIT & BSD-3-Clause"
37LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
38 file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \
39 file://thirdparty/cnpy/LICENSE;md5=689f10b06d1ca2d4b1057e67b16cd580 \
40 file://thirdparty/protobuf/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
41 file://thirdparty/json/nlohmann_json/LICENSE.MIT;md5=441793d25a658d58d79a1f87516a6ad1 \
42 file://thirdparty/json/nlohmann_json_schema_validator/LICENSE;md5=c441d022da1b1663c70181a32225d006 \
43 file://thirdparty/open_model_zoo/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
44 file://src/plugins/intel_cpu/thirdparty/mkl-dnn/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
45 file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \
46 file://src/bindings/python/thirdparty/pybind11/LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f \
47"
48
49inherit cmake python3native
50
51S = "${WORKDIR}/git"
52EXTRA_OECMAKE += " \
53 -DENABLE_OPENCV=OFF \
54 -DOpenCV_DIR=${STAGING_LIBDIR}/cmake \
55 -DENABLE_PLUGIN_RPATH=0 \
56 -DENABLE_INTEL_GNA=OFF \
57 -DPYTHON_EXECUTABLE=${PYTHON} \
58 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
59 -DTHREADING=TBB -DTBB_DIR="${STAGING_LIBDIR}/cmake/TBB" \
60 -DENABLE_SAMPLES=ON \
61 -DTREAT_WARNING_AS_ERROR=FALSE \
62 -DENABLE_DATA=FALSE \
63 -DENABLE_SYSTEM_PUGIXML=TRUE \
64 -DENABLE_SYSTEM_PROTOBUF=TRUE \
65 -DProtobuf_LIBRARIES=protobuf \
66 -DProtobuf_LITE_LIBRARIES=protobuf-lite \
67 -DProtobuf_INCLUDE_DIR=${STAGING_INCDIR} \
68 -DSYSTEM_PROTOC=${STAGING_BINDIR_NATIVE}/protoc \
69 -DENABLE_OV_ONNX_FRONTEND=FALSE \
70 -DUSE_BUILD_TYPE_SUBFOLDER=OFF \
71 "
72
73DEPENDS += "libusb1 \
74 ade \
75 opencv \
76 pugixml \
77 protobuf \
78 protobuf-native \
79 tbb \
80 zlib \
81 "
82
83COMPATIBLE_HOST = '(x86_64).*-linux'
84COMPATIBLE_HOST:libc-musl = "null"
85
86#Disable opencl temporarily. intel-compute-runtime depends on
87#intel-graphics-compiler and vc-intrinsics and these two recipes fail to
88#compile with LLVM13. Enable it after upstream has fixed it.
89#PACKAGECONFIG ?= "vpu opencl"
90PACKAGECONFIG ?= "vpu"
91PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE -DOpenCL_INCLUDE_DIR=${STAGING_INCDIR} -DOpenCL_LIBRARY=${STAGING_LIBDIR}/libOpenCL.so, -DENABLE_INTEL_GPU=FALSE, ocl-icd opencl-headers opencl-clhpp libva,"
92PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR}, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-opencv python3-progress python3-cython"
93PACKAGECONFIG[vpu] = "-DENABLE_INTEL_MYRIAD=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_INTEL_MYRIAD=OFF,,${PN}-vpu-firmware"
94PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0"
95
96do_configure:prepend() {
97 # Dont set PROJECT_ROOT_DIR
98 sed -i -e 's:\${CMAKE_CURRENT_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt
99}
100
101do_install:append() {
102 if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
103 install -d ${D}${datadir}/openvino
104 mv ${D}/usr/samples/python ${D}${datadir}/openvino/
105
106 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
107 mv ${D}${prefix}/python/${PYTHON_DIR}/openvino ${D}${PYTHON_SITEPACKAGES_DIR}/
108 mv ${D}${prefix}/python/${PYTHON_DIR}/ngraph ${D}${PYTHON_SITEPACKAGES_DIR}/
109
110 rm -rf ${D}${prefix}/python
111 fi
112
113 rm -rf ${D}${prefix}/deployment_tools
114
115 # Remove the samples source directory. We install the built samples.
116 rm -rf ${D}/usr/samples
117
118 sed -i -e 's:^#include.*imp.hpp"$:#include "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/git/src/plugins/intel_cpu/src/nodes/proposal_imp.hpp":g;' ${B}/src/plugins/intel_cpu/cross-compiled/proposal_imp_disp.cpp
119}
120
121# Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR
122# instead of RSS
123SSTATE_SCAN_FILES:append = " *.cmake"
124
125FILES:${PN}-dev = "${includedir} \
126 ${libdir}/cmake \
127 "
128
129FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \
130 ${datadir}/openvino \
131 ${libdir}/custom_kernels \
132 ${libdir}/plugins.xml \
133 ${libdir}/cache.json \
134 "
135
136# Move inference engine samples into a separate package
137PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware"
138
139FILES:${PN}-samples = "${datadir}/openvino \
140 ${bindir} \
141 "
142FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd"
143
144# Package for inference engine python API
145PACKAGES =+ "${PN}-${PYTHON_PN}"
146
147FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}"
148
149UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"