MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

openvino-inference-engine: fix multilib build

Browse Source 
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>
This commit is contained in:
Anuj Mittal 2023-10-06 15:29:16 +08:00
parent 6a3d314f43
commit 086552f600
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch
View File

@ -1,4 +1,4 @@
From 7deabff3d51df783c3e24bcc190c3ddebca7d9a8 Mon Sep 17 00:00:00 2001 From a704afcc9e238dceafb3b1bc91b0b8abed3593eb Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com> From: Anuj Mittal <anuj.mittal@intel.com>
Date: Thu, 21 Sep 2023 14:07:28 +0800 Date: Thu, 21 Sep 2023 14:07:28 +0800
Subject: [PATCH] cmake: yocto specific tweaks to the build process Subject: [PATCH] cmake: yocto specific tweaks to the build process
@ -8,6 +8,7 @@ Subject: [PATCH] cmake: yocto specific tweaks to the build process
* Install sample binaries as well. * Install sample binaries as well.
* Dont strip binaries. * Dont strip binaries.
* Dont try to write triggers for CPack. We package ourselves. * Dont try to write triggers for CPack. We package ourselves.
* Fix the installation path for Python modules when baselib = lib64.
Upstream-Status: Inappropriate Upstream-Status: Inappropriate
@ -16,9 +17,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
cmake/developer_package/target_flags.cmake | 2 +- cmake/developer_package/target_flags.cmake | 2 +-
samples/cpp/CMakeLists.txt | 6 +++--- samples/cpp/CMakeLists.txt | 6 +++---
src/bindings/python/CMakeLists.txt | 2 +-
src/bindings/python/wheel/setup.py | 1 - src/bindings/python/wheel/setup.py | 1 -
thirdparty/dependencies.cmake | 10 +++++----- thirdparty/dependencies.cmake | 10 +++++-----
5 files changed, 10 insertions(+), 11 deletions(-) 6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
index 0609750054f..0f5c7765197 100644 index 0609750054f..0f5c7765197 100644
@ -60,6 +62,19 @@ index 8849aaf47d1..450b57c18d6 100644
# create global target with all samples / demo apps # create global target with all samples / demo apps
if(NOT TARGET ie_samples) if(NOT TARGET ie_samples)
diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
index f337f403189..21012162093 100644
--- a/src/bindings/python/CMakeLists.txt
+++ b/src/bindings/python/CMakeLists.txt
@@ -314,7 +314,7 @@ if(ENABLE_PYTHON_PACKAGING)
endif()
set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}")
- set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}")
+ set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}")
set(meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
set(meta_info_file "${install_lib}/${meta_info_subdir}/PKG-INFO")
diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py diff --git a/src/bindings/python/wheel/setup.py b/src/bindings/python/wheel/setup.py
index 04323a8ba49..0498dcdc126 100644 index 04323a8ba49..0498dcdc126 100644
--- a/src/bindings/python/wheel/setup.py --- a/src/bindings/python/wheel/setup.py