summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2023-10-06 15:29:16 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2023-10-09 09:33:40 +0800
commit086552f6004581145ecd4b39c30eb7e9326b28ab (patch)
tree4de402c1f8df8d2435bd62065156f74e6064bd76 /dynamic-layers/openembedded-layer/recipes-support/opencv/files
parent6a3d314f431fc5e59e65d237cb7ce343f7d32d33 (diff)
downloadmeta-intel-086552f6004581145ecd4b39c30eb7e9326b28ab.tar.gz
openvino-inference-engine: fix multilib build
Make sure Python modules are installed correctly when baselib = lib64. Fixes errors: 15:33:18 ERROR: openvino-inference-engine-2023.1.0-r0 do_package: QA Issue: openvino-inference-engine: Files/directories were installed but not shipped in any package: 15:33:18 /usr/lib/python3.11/site-packages/_pyngraph.cpython-311-x86_64-linux-gnu.so 15:33:18 /usr/lib/python3.11/site-packages/ngraph ... 15:33:18 /usr/lib/python3.11/site-packages/openvino-2023.1.0-py3.11.egg-info/top_level.txt 15:33:18 /usr/lib/python3.11/site-packages/openvino-2023.1.0-py3.11.egg-info/SOURCES.txt 15:33:18 Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. 15:33:18 openvino-inference-engine: 172 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch19
1 files changed, 17 insertions, 2 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
index 9e71e689..292c534a 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
@@ -1,4 +1,4 @@
1From 7deabff3d51df783c3e24bcc190c3ddebca7d9a8 Mon Sep 17 00:00:00 2001 1From a704afcc9e238dceafb3b1bc91b0b8abed3593eb Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 21 Sep 2023 14:07:28 +0800 3Date: Thu, 21 Sep 2023 14:07:28 +0800
4Subject: [PATCH] cmake: yocto specific tweaks to the build process 4Subject: [PATCH] cmake: yocto specific tweaks to the build process
@@ -8,6 +8,7 @@ Subject: [PATCH] cmake: yocto specific tweaks to the build process
8* Install sample binaries as well. 8* Install sample binaries as well.
9* Dont strip binaries. 9* Dont strip binaries.
10* Dont try to write triggers for CPack. We package ourselves. 10* Dont try to write triggers for CPack. We package ourselves.
11* Fix the installation path for Python modules when baselib = lib64.
11 12
12Upstream-Status: Inappropriate 13Upstream-Status: Inappropriate
13 14
@@ -16,9 +17,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
16 cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- 17 cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
17 cmake/developer_package/target_flags.cmake | 2 +- 18 cmake/developer_package/target_flags.cmake | 2 +-
18 samples/cpp/CMakeLists.txt | 6 +++--- 19 samples/cpp/CMakeLists.txt | 6 +++---
20 src/bindings/python/CMakeLists.txt | 2 +-
19 src/bindings/python/wheel/setup.py | 1 - 21 src/bindings/python/wheel/setup.py | 1 -
20 thirdparty/dependencies.cmake | 10 +++++----- 22 thirdparty/dependencies.cmake | 10 +++++-----
21 5 files changed, 10 insertions(+), 11 deletions(-) 23 6 files changed, 11 insertions(+), 12 deletions(-)
22 24
23diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake 25diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
24index 0609750054f..0f5c7765197 100644 26index 0609750054f..0f5c7765197 100644
@@ -60,6 +62,19 @@ index 8849aaf47d1..450b57c18d6 100644
60 62
61 # create global target with all samples / demo apps 63 # create global target with all samples / demo apps
62 if(NOT TARGET ie_samples) 64 if(NOT TARGET ie_samples)
65diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
66index f337f403189..21012162093 100644
67--- a/src/bindings/python/CMakeLists.txt
68+++ b/src/bindings/python/CMakeLists.txt
69@@ -314,7 +314,7 @@ if(ENABLE_PYTHON_PACKAGING)
70 endif()
71
72 set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
73- set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
74+ set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
75 set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
76 set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO")
77
63diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py 78diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
64index 04323a8ba49..0498dcdc126 100644 79index 04323a8ba49..0498dcdc126 100644
65--- a/src/bindings/python/wheel/setup.py 80--- a/src/bindings/python/wheel/setup.py