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

openvino-inference-engine: fix multilib build

Browse Source 
Switch to using variables defined for RPM generation as it more closely
aligns with how we install libraries and remove the tweak done for
debian variables.

Also fixes packaging issues when BASELIB is set to lib64:

| 20:18:42  ERROR: openvino-inference-engine-2022.3.0-r0 do_package: QA Issue: openvino-inference-engine: Files/directories were installed but not shipped in any package:
| 20:18:42    /usr/lib/python3.10/site-packages/_pyngraph.cpython-310-x86_64-linux-gnu.so
| 20:18:42    /usr/lib/python3.10/site-packages/requirements.txt
...
| 20:18:42    /usr/lib/python3.10/site-packages/openvino/inference_engine/ie_api.cpython-310-x86_64-linux-gnu.so
| 20:18:42    /usr/lib/python3.10/site-packages/openvino/inference_engine/constants.cpython-310-x86_64-linux-gnu.so
| 20:18:42    /usr/lib/python3.10/site-packages/openvino/inference_engine/__init__.py

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2023-01-17 12:58:06 +08:00
parent e99756e072
commit a9242002cb
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,23 +10,6 @@ Yocto specific tweaks to the build process:
Upstream-Status: Inappropriate
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
diff --git a/cmake/developer_package/packaging/debian/debian.cmake b/cmake/developer_package/packaging/debian/debian.cmake
index 735160b469..26f51229e2 100644
--- a/cmake/developer_package/packaging/debian/debian.cmake
+++ b/cmake/developer_package/packaging/debian/debian.cmake
@@ -31,7 +31,11 @@ macro(ov_debian_cpack_set_dirs)
set(OV_CPACK_NGRAPH_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/ngraph${OpenVINO_VERSION})
set(OV_CPACK_OPENVINO_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/openvino${OpenVINO_VERSION})
set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
- set(OV_CPACK_PYTHONDIR lib/python3/dist-packages)
+
+ ov_get_pyversion(pyversion)
+ if(pyversion)
+ set(OV_CPACK_PYTHONDIR lib/${pyversion}/site-packages)
+ endif()
# non-native stuff
set(OV_CPACK_SHAREDIR ${CMAKE_INSTALL_DATADIR}/openvino) # internal
diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
index 62831fffab..b123bbad75 100644
--- a/cmake/developer_package/target_flags.cmake

3
dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb
View File

@ -56,7 +56,7 @@ EXTRA_OECMAKE += " \
-DUSE_BUILD_TYPE_SUBFOLDER=OFF \
-DENABLE_FUZZING=OFF \
-DENABLE_TBBBIND_2_5=OFF \
-DCPACK_GENERATOR=DEB \
-DCPACK_GENERATOR=RPM \
"
@ -88,7 +88,6 @@ do_configure:prepend() {
do_install:append() {
rm -rf ${D}${prefix}/install_dependencies
rm -rf ${D}${prefix}/setupvars.sh
rm -rf ${D}${datadir}/lintian
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
}