diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/fix-build.patch | 17 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb | 3 |
2 files changed, 1 insertions, 19 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: | |||
10 | Upstream-Status: Inappropriate | 10 | Upstream-Status: Inappropriate |
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
12 | 12 | ||
13 | diff --git a/cmake/developer_package/packaging/debian/debian.cmake b/cmake/developer_package/packaging/debian/debian.cmake | ||
14 | index 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 | ||
30 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake | 13 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake |
31 | index 62831fffab..b123bbad75 100644 | 14 | index 62831fffab..b123bbad75 100644 |
32 | --- a/cmake/developer_package/target_flags.cmake | 15 | --- a/cmake/developer_package/target_flags.cmake |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb index f7dc5ce2..2e28ae8f 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2022.3.0.bb | |||
@@ -56,7 +56,7 @@ EXTRA_OECMAKE += " \ | |||
56 | -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ | 56 | -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ |
57 | -DENABLE_FUZZING=OFF \ | 57 | -DENABLE_FUZZING=OFF \ |
58 | -DENABLE_TBBBIND_2_5=OFF \ | 58 | -DENABLE_TBBBIND_2_5=OFF \ |
59 | -DCPACK_GENERATOR=DEB \ | 59 | -DCPACK_GENERATOR=RPM \ |
60 | " | 60 | " |
61 | 61 | ||
62 | 62 | ||
@@ -88,7 +88,6 @@ do_configure:prepend() { | |||
88 | do_install:append() { | 88 | do_install:append() { |
89 | rm -rf ${D}${prefix}/install_dependencies | 89 | rm -rf ${D}${prefix}/install_dependencies |
90 | rm -rf ${D}${prefix}/setupvars.sh | 90 | rm -rf ${D}${prefix}/setupvars.sh |
91 | rm -rf ${D}${datadir}/lintian | ||
92 | 91 | ||
93 | 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 | 92 | 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 |
94 | } | 93 | } |