Use the version of protobuf fetched by OpenVINO instead of the system version to avoid problems [1] because of differences in what was tested.
The build invokes protoc at build time so provide a qemu wrapper that will allow that to be run on build machine. [1] https://protobuf.dev/news/2022-05-06/#python-updates Signed-off-by: Anuj Mittal <[email protected]> --- ...obuf-allow-target-protoc-to-be-built.patch | 45 +++++++++++++++++++ .../openvino-inference-engine_2023.0.0.bb | 20 ++++++--- 2 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-protobuf-allow-target-protoc-to-be-built.patch diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-protobuf-allow-target-protoc-to-be-built.patch new file mode 100644 index 00000000..6bc54335 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-protobuf-allow-target-protoc-to-be-built.patch @@ -0,0 +1,45 @@ +From 450a1ba74eb5a6cf3946d8ae84b7de5bc97ccb35 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Tue, 13 Jun 2023 12:34:08 +0800 +Subject: [PATCH] protobuf: allow target protoc to be built + +We can run target binaries using a qemu wrapper so allow these to be +built and run. + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal <[email protected]> +--- + cmake/developer_package/frontends/frontends.cmake | 2 +- + thirdparty/protobuf/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake +index 897e6f8e3a6..32b136fcea9 100644 +--- a/cmake/developer_package/frontends/frontends.cmake ++++ b/cmake/developer_package/frontends/frontends.cmake +@@ -146,7 +146,7 @@ macro(ov_add_frontend) + set(GENERATED_PROTO ${INFILE}) + add_custom_command( + OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" +- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto ++ COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto + DEPENDS ${PROTOC_DEPENDENCY} ${GENERATED_PROTO} + COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${GENERATED_PROTO}" + VERBATIM +diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt +index 79e69a47b09..087f9e838c2 100644 +--- a/thirdparty/protobuf/CMakeLists.txt ++++ b/thirdparty/protobuf/CMakeLists.txt +@@ -27,7 +27,7 @@ set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support" FORCE) + if(CMAKE_CROSSCOMPILING OR + (APPLE AND (HOST_X86_64 AND AARCH64)) OR + (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) +- set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE) ++ set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) + else() + set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) + endif() +-- +2.37.3 + diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.0.bb index 193e33a1..0882f424 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.0.0.bb @@ -10,11 +10,13 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=r git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ git://github.com/nlohmann/json.git;protocol=https;destsuffix=git/thirdparty/json/nlohmann_json;name=json;branch=develop \ git://github.com/opencv/ade.git;protocol=https;destsuffix=git/thirdparty/ade;name=ade;nobranch=1 \ + git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ file://fix-build.patch \ file://cython-cmake.patch \ file://7cecc9138b89e1946e3e515727bb69b2ab119806.patch;patchdir=thirdparty/ade \ file://fix-build-with-gcc13.patch \ file://onednn-fix-build-with-gcc13.patch;patchdir=src/plugins/intel_gpu/thirdparty/onednn_gpu \ + file://0001-protobuf-allow-target-protoc-to-be-built.patch \ " SRCREV = "b4452d5630442e91cf84db5acd3d991f3d1f34c2" @@ -23,6 +25,7 @@ SRCREV_onednn = "f27dedbfc093f51032a4580198bb80579440dc15" SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" SRCREV_json = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" SRCREV_ade = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" +SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" LICENSE = "Apache-2.0 & MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ @@ -34,10 +37,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=b48e3de3bfd47c27882a0d85b20823f5 \ " -inherit cmake python3native pkgconfig +inherit cmake python3native pkgconfig qemu S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ + -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ -DENABLE_OPENCV=OFF \ -DENABLE_INTEL_GNA=OFF \ -DENABLE_SYSTEM_TBB=ON \ @@ -47,7 +51,6 @@ EXTRA_OECMAKE += " \ -DTREAT_WARNING_AS_ERROR=FALSE \ -DENABLE_DATA=FALSE \ -DENABLE_SYSTEM_PUGIXML=TRUE \ - -DENABLE_SYSTEM_PROTOBUF=TRUE \ -DENABLE_OV_ONNX_FRONTEND=FALSE \ -DUSE_BUILD_TYPE_SUBFOLDER=OFF \ -DENABLE_FUZZING=OFF \ @@ -57,15 +60,12 @@ EXTRA_OECMAKE += " \ -DENABLE_SYSTEM_SNAPPY=ON \ " - DEPENDS += "\ flatbuffers-native \ gflags \ - protobuf \ - protobuf-native \ - protobuf-c \ pugixml \ python3-pybind11 \ + qemu-native \ snappy \ tbb \ zlib \ @@ -83,6 +83,14 @@ PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" do_configure:prepend() { # Dont set PROJECT_ROOT_DIR sed -i -e 's:\${OpenVINO_SOURCE_DIR}::;' ${S}/src/CMakeLists.txt + + # qemu wrapper that can be used by cmake to run target binaries. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper } do_install:append() { -- 2.40.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8000): https://lists.yoctoproject.org/g/meta-intel/message/8000 Mute This Topic: https://lists.yoctoproject.org/mt/99501001/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/leave/6694807/21656/1869269227/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
