summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2023-01-17 12:58:06 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2023-01-17 13:02:04 +0800
commita9242002cb14489013d536be010a243d6da01dd2 (patch)
treeca235954f077edd9cfa5d43e5460d812ea663ecf /dynamic-layers/openembedded-layer/recipes-support/opencv/files
parente99756e072a718c84fbd301c2375ad8801b717c6 (diff)
downloadmeta-intel-a9242002cb14489013d536be010a243d6da01dd2.tar.gz
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 <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.patch17
1 files changed, 0 insertions, 17 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 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:
10Upstream-Status: Inappropriate 10Upstream-Status: Inappropriate
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12 12
13diff --git a/cmake/developer_package/packaging/debian/debian.cmake b/cmake/developer_package/packaging/debian/debian.cmake
14index 735160b469..26f51229e2 100644
15--- a/cmake/developer_package/packaging/debian/debian.cmake
16+++ b/cmake/developer_package/packaging/debian/debian.cmake
17@@ -31,7 +31,11 @@ macro(ov_debian_cpack_set_dirs)
18 set(OV_CPACK_NGRAPH_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/ngraph${OpenVINO_VERSION})
19 set(OV_CPACK_OPENVINO_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/openvino${OpenVINO_VERSION})
20 set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
21- set(OV_CPACK_PYTHONDIR lib/python3/dist-packages)
22+
23+ ov_get_pyversion(pyversion)
24+ if(pyversion)
25+ set(OV_CPACK_PYTHONDIR lib/${pyversion}/site-packages)
26+ endif()
27
28 # non-native stuff
29 set(OV_CPACK_SHAREDIR ${CMAKE_INSTALL_DATADIR}/openvino) # internal
30diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake 13diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
31index 62831fffab..b123bbad75 100644 14index 62831fffab..b123bbad75 100644
32--- a/cmake/developer_package/target_flags.cmake 15--- a/cmake/developer_package/target_flags.cmake