mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
086552f600
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>
114 lines
4.7 KiB
Diff
114 lines
4.7 KiB
Diff
From a704afcc9e238dceafb3b1bc91b0b8abed3593eb Mon Sep 17 00:00:00 2001
|
|
From: Anuj Mittal <anuj.mittal@intel.com>
|
|
Date: Thu, 21 Sep 2023 14:07:28 +0800
|
|
Subject: [PATCH] cmake: yocto specific tweaks to the build process
|
|
|
|
* Dont try to detect glibc version as that doesn't work when cross compiling.
|
|
* Use shared gflags libs.
|
|
* Install sample binaries as well.
|
|
* Dont strip binaries.
|
|
* Dont try to write triggers for CPack. We package ourselves.
|
|
* Fix the installation path for Python modules when baselib = lib64.
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
cmake/developer_package/packaging/rpm/rpm.cmake | 2 +-
|
|
cmake/developer_package/target_flags.cmake | 2 +-
|
|
samples/cpp/CMakeLists.txt | 6 +++---
|
|
src/bindings/python/CMakeLists.txt | 2 +-
|
|
src/bindings/python/wheel/setup.py | 1 -
|
|
thirdparty/dependencies.cmake | 10 +++++-----
|
|
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
|
|
index 0609750054f..0f5c7765197 100644
|
|
--- a/cmake/developer_package/packaging/rpm/rpm.cmake
|
|
+++ b/cmake/developer_package/packaging/rpm/rpm.cmake
|
|
@@ -161,7 +161,7 @@ ov_rpm_specific_settings()
|
|
# needed to add triggers for packages with libraries
|
|
set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers")
|
|
set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n")
|
|
-file(WRITE "${def_triggers}" "${triggers_content}")
|
|
+#file(WRITE "${def_triggers}" "${triggers_content}")
|
|
|
|
#
|
|
# Functions helpful for packaging your modules with RPM cpack
|
|
diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
|
|
index 29f23e713e1..942dd445b19 100644
|
|
--- a/cmake/developer_package/target_flags.cmake
|
|
+++ b/cmake/developer_package/target_flags.cmake
|
|
@@ -145,4 +145,4 @@ function(ov_glibc_version)
|
|
endif()
|
|
endfunction()
|
|
|
|
-ov_glibc_version()
|
|
+#ov_glibc_version()
|
|
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
|
|
index 8849aaf47d1..450b57c18d6 100644
|
|
--- a/samples/cpp/CMakeLists.txt
|
|
+++ b/samples/cpp/CMakeLists.txt
|
|
@@ -223,9 +223,9 @@ macro(ie_add_sample)
|
|
target_link_libraries(${IE_SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${IE_SAMPLE_DEPENDENCIES})
|
|
|
|
install(TARGETS ${IE_SAMPLE_NAME}
|
|
- RUNTIME DESTINATION samples_bin/
|
|
- COMPONENT samples_bin
|
|
- EXCLUDE_FROM_ALL)
|
|
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
+ COMPONENT samples_bin)
|
|
+
|
|
|
|
# create global target with all samples / demo apps
|
|
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
|
|
index 04323a8ba49..0498dcdc126 100644
|
|
--- a/src/bindings/python/wheel/setup.py
|
|
+++ b/src/bindings/python/wheel/setup.py
|
|
@@ -270,7 +270,6 @@ class CustomBuild(build):
|
|
self.spawn(["cmake", "--install", binary_dir,
|
|
"--prefix", prefix,
|
|
"--config", "Release",
|
|
- "--strip",
|
|
"--component", cpack_comp_name])
|
|
|
|
def run(self):
|
|
diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake
|
|
index 43e0ed671a9..b39479fdd6b 100644
|
|
--- a/thirdparty/dependencies.cmake
|
|
+++ b/thirdparty/dependencies.cmake
|
|
@@ -338,11 +338,11 @@ if(ENABLE_SAMPLES OR ENABLE_TESTS)
|
|
elseif(APPLE OR WIN32)
|
|
# on Windows and macOS we don't use gflags, because will be dynamically linked
|
|
elseif(CMAKE_HOST_LINUX AND LINUX)
|
|
- if(OV_OS_RHEL)
|
|
- set(gflag_component nothreads_shared)
|
|
- elseif(OV_OS_DEBIAN)
|
|
- set(gflag_component nothreads_static)
|
|
- endif()
|
|
+ #if(OV_OS_RHEL)
|
|
+ set(gflag_component nothreads_shared)
|
|
+ #elseif(OV_OS_DEBIAN)
|
|
+ # set(gflag_component nothreads_static)
|
|
+ #endif()
|
|
find_package(gflags QUIET OPTIONAL_COMPONENTS ${gflag_component})
|
|
endif()
|
|
|
|
--
|
|
2.37.3
|
|
|