From a9242002cb14489013d536be010a243d6da01dd2 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 17 Jan 2023 12:58:06 +0800 Subject: openvino-inference-engine: fix multilib build 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 --- .../recipes-support/opencv/files/fix-build.patch | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files') 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 07a29fe7..ed488808 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 @@ -10,23 +10,6 @@ Yocto specific tweaks to the build process: Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal -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 -- cgit v1.2.3-54-g00ecf