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 <[email protected]> --- .../opencv/files/fix-build.patch | 17 ----------------- .../openvino-inference-engine_2022.3.0.bb | 3 +-- 2 files changed, 1 insertion(+), 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: Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal <[email protected]> -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 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 += " \ -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 } -- 2.39.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7793): https://lists.yoctoproject.org/g/meta-intel/message/7793 Mute This Topic: https://lists.yoctoproject.org/mt/96325449/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
