From 54a9df3d53d4e429622fd91b697d8d2a128af6f0 Mon Sep 17 00:00:00 2001 From: Maximilian Schmidt Date: Thu, 6 Jun 2024 12:27:31 +0000 Subject: [PATCH] upgrade to latest scarthgap, build aarch64 SDKs --- .../workflows/{Dockerfile => Containerfile} | 0 .../workflows/{yocto_cicd.yml => cicd.yml} | 17 +- README.md | 23 +- kas/aarch64.yml | 6 + kas-project.yml => kas/base.yml | 20 +- kas/hulks.yml | 12 + meta-hulks/conf/distro/HULKs-OS.conf | 2 +- .../recipes-core/images/nao-image.bbappend | 1 + meta/conf/distro/nao-core-minimal.conf | 2 +- .../0005-downgrade_openvino_to_2023.3.0.patch | 234 ------------------ 10 files changed, 51 insertions(+), 266 deletions(-) rename .github/workflows/{Dockerfile => Containerfile} (100%) rename .github/workflows/{yocto_cicd.yml => cicd.yml} (70%) create mode 100644 kas/aarch64.yml rename kas-project.yml => kas/base.yml (75%) create mode 100644 kas/hulks.yml delete mode 100644 patches/0005-downgrade_openvino_to_2023.3.0.patch diff --git a/.github/workflows/Dockerfile b/.github/workflows/Containerfile similarity index 100% rename from .github/workflows/Dockerfile rename to .github/workflows/Containerfile diff --git a/.github/workflows/yocto_cicd.yml b/.github/workflows/cicd.yml similarity index 70% rename from .github/workflows/yocto_cicd.yml rename to .github/workflows/cicd.yml index 2d957b7..114adc4 100644 --- a/.github/workflows/yocto_cicd.yml +++ b/.github/workflows/cicd.yml @@ -1,8 +1,8 @@ -name: Yocto CI/CD +name: CI/CD on: push jobs: cicd: - name: Yocto CI/CD + name: CI/CD runs-on: - self-hosted - v3 @@ -17,13 +17,15 @@ jobs: fetch-depth: 0 path: meta-nao - name: Checkout Yocto layers - run: kas checkout meta-nao/kas-project.yml + run: kas checkout meta-nao/kas/base.yml:meta-nao/kas/hulks.yml - name: Populate aldebaran_binaries.tar.gz run: mkdir -p meta-nao/meta/recipes-support/aldebaran/aldebaran-binaries/ && cp /aldebaran_binaries.tar.gz meta-nao/meta/recipes-support/aldebaran/aldebaran-binaries/ - name: Build image - run: kas build --target nao-image --cmd build meta-nao/kas-project.yml - - name: Build SDK - run: kas build --target nao-image --cmd populate_sdk meta-nao/kas-project.yml + run: kas build --target nao-image --cmd build meta-nao/kas/base.yml:meta-nao/kas/hulks.yml + - name: Build SDK (x86_64) + run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml + - name: Build SDK (aarch64) + run: kas build --target nao-image --cmd populate_sdk meta-nao/kas/base.yml:meta-nao/kas/hulks.yml:meta-nao/kas/aarch64.yml - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') @@ -32,5 +34,6 @@ jobs: body: Flashable image containing HULKs-OS ${{ github.ref_name }} and the corresponding SDK with the toolchain and other tools targeting HULKs-OS, for instructions see https://hulks.de/hulk/setup/overview/ files: | build/tmp/deploy/images/nao-v6/nao-image-HULKs-OS-${{ github.ref_name }}.ext3.gz.opn - build/tmp/deploy/sdk/HULKs-OS-toolchain-${{ github.ref_name }}.sh + build/tmp/deploy/sdk/HULKs-OS-x86_64-toolchain-${{ github.ref_name }}.sh + build/tmp/deploy/sdk/HULKs-OS-aarch64-toolchain-${{ github.ref_name }}.sh fail_on_unmatched_files: true diff --git a/README.md b/README.md index f206b63..5e4b280 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ As this is a very first attempt with the Yocto project and image construction fo 2. For project setup the [siemens/kas](https://github.com/siemens/kas) framework is used. To setup *kas* use the containerized (podman/docker) version via the `kas-container` script provided [here](https://github.com/siemens/kas/blob/master/kas-container) and store it inside the `worktree` directory. Alternatively setup *kas* via a *python-pip* installation, follow the installation steps in the [user guide](https://kas.readthedocs.io/en/latest/userguide.html). -3. *meta-nao* ships a `kas-project.yml` project description file. This file defines the project structure *kas* has to setup for the Yocto build phase. +3. *meta-nao* ships multiple `kas-project.yml` project description file. This file defines the project structure *kas* has to setup for the Yocto build phase. Clone the *meta-nao* repository into some directory used for the Yocto build e.g. `worktree/meta-nao`. ``` @@ -29,10 +29,10 @@ mkdir -p aldebaran-binaries The script references the original robocupper image shipped by softbank. Contact the RoboCup SPL TC to get this image. If you get errors regarding `libguestfs` and `supermin`, try running `./extract_binaries.sh` with root permissions again. -5. Execute *kas* from inside the `worktree` directory referencing the `kas-project.yml` to enter the build environment +5. Execute *kas* from inside the `worktree` directory referencing the project description files to enter the build environment ``` -./kas-container -d shell meta-nao/kas-project.yml +./kas-container shell meta-nao/kas/base.yml:meta-nao/kas/hulks.yml ``` *kas* fetches all necessary build sources and sets them up in the respective `worktree` directory. After *kas* has setup the working directory, your directory structure should look like this: @@ -58,7 +58,7 @@ bitbake nao-image This generates and executes all necessary tasks and targets to construct a proper `.opn` file. This build phase might take several hours depending on the performance of your build machine and your internet connection. *BitBake* uses a very elaborated caching strategy to speed up following builds of targets. Thus small changes afterwards can only take a few minutes. -7. Fetch and deploy the image. After *BitBake* ran all tasks up to `nao-opn` a new `.opn` file is generated in `worktree/build/tmp/deploy/images/nao-v6/nao-image-HULKs-OS-[...].ext3.gz.opn`. To setup a flash stick run: +7. Fetch and deploy the image. After *BitBake* ran all tasks up to `nao-opn` a new `.opn` file is generated in `worktree/build/tmp/deploy/images/nao-v6/nao-image-HULKs-OS-[VERSION].ext3.gz.opn`. To setup a flash stick run: ``` dd if=image_path.opn of=/dev/sdb bs=4M status=progress oflag=sync @@ -68,30 +68,31 @@ dd if=image_path.opn of=/dev/sdb bs=4M status=progress oflag=sync ### How can I log into the robot? -The login credentials for user *root* and *nao* are defined in `meta-nao/recipes-core/images/nao-image.bb`. +The login credentials for user *root* and *nao* are defined in `meta-nao/meta/recipes-core/images/nao-image.bb`. Per default the nao user has an empty password. The password of the root user is *root*. ### How can I configure IP addresses? -Currently there is no proper network manager installed. This means, networking is controlled via *systemd-networkd* and respective `.network` units. This might change in the future. Team HULKs did not yet decide on the best way to go. Up until now you can configure the network via `wpa_supplicant.conf` and proper `.network` files. Have a look at `meta-nao/recipes-conf/nao-wifi-conf/nao-wifi-conf/80-wlan.network` and `meta-nao/recipes-conf/nao-wifi-conf/nao-wifi-conf/wpa_supplicant-nl80211-wlan0.conf`. -If you have suggestions how to tackle the network configuration problem, please let us know. +Networking is controlled via *systemd-networkd* and respective `.network` units. You can configure the network via `wpa_supplicant.conf` and respective `.network` files. Have a look at `meta-nao/meta/recipes-conf/nao-wifi-conf/nao-wifi-conf/80-wlan.network` and `meta-nao/meta/recipes-conf/nao-wifi-conf/nao-wifi-conf/wpa_supplicant-nl80211-wlan0.conf`. ### How can I customize the image? -The Yocto Project is organized in layers. You can edit the existing *meta-nao* layer or (better) add an additional layer alongside *meta-nao*, *meta-openembedded*, etc. to overlay configuration in other layers. Have a look at [meta-example](https://github.com/HULKs/meta-example) for an example overlay extending the nao image by the *boost* library. +The Yocto Project is organized in layers. You can edit the existing *meta-nao/meta* layer or (better) add an additional layer alongside *meta-nao*, *meta-openembedded*, etc. to overlay configuration in other layers. Have a look at [meta-example](https://github.com/HULKs/meta-example) for an example overlay extending the nao image by the *boost* library. You can use [https://layers.openembedded.org/layerindex/branch/master/recipes/](https://layers.openembedded.org/layerindex/branch/master/recipes/) to search for existing recipes. ### How do I target the nao architecture during development? -The Yocto project contains tasks to build a proper SDK to use for development. To build the sdk do the following: +The Yocto project contains tasks to build a proper SDK to use for development. To build the SDK do the following: 1. Enter the build container ``` -./kas-container -d shell meta-nao/kas-project.yml +./kas-container -d shell meta-nao/kas/base.yml:meta-nao/kas/hulks.yml ``` +You can append the `aarch64.yml` project description to configure Yocto for building a aarch64 SDK. + 2. Build the SDK (from inside the container) ``` @@ -102,7 +103,7 @@ This again takes several hours. On machines at HULKs this can take up to 4 hours 3. Download and install the SDK -After a successful build, the SDK is located at `worktree/build/tmp/deploy/sdk/HULKs-OS-toolchain-[...].sh`. To install the SDK run the script and follow the instructions. Afterwards you are able to source the build environment and use the respective cross compilers. +After a successful build, the SDK is located at `worktree/build/tmp/deploy/sdk/HULKs-OS-[MACHINE]-toolchain-[VERSION].sh`. To install the SDK run the script and follow the instructions. Afterwards you are able to source the build environment and use the respective cross compilers. ## Links and Resources diff --git a/kas/aarch64.yml b/kas/aarch64.yml new file mode 100644 index 0000000..a8dbd75 --- /dev/null +++ b/kas/aarch64.yml @@ -0,0 +1,6 @@ +header: + version: 14 + +local_conf_header: + aarch64-sdk: | + SDKMACHINE = "aarch64" diff --git a/kas-project.yml b/kas/base.yml similarity index 75% rename from kas-project.yml rename to kas/base.yml index 6237afa..e5cdedb 100644 --- a/kas-project.yml +++ b/kas/base.yml @@ -2,23 +2,23 @@ header: version: 14 machine: nao-v6 -distro: HULKs-OS +distro: nao-core-minimal target: nao-image + local_conf_header: meta-nao: | CONF_VERSION = "2" - SDK_TOOLCHAIN_LANGS ?= "rust" PACKAGE_CLASSES ?= "package_ipk" - CLANGSDK = "1" EXTRA_IMAGE_FEATURES += "allow-empty-password" + CLANGSDK = "1" + repos: meta-nao: layers: meta: - meta-hulks: poky: url: "https://git.yoctoproject.org/git/poky" - commit: ca93c215fdd2e0f3b0ab4a205ccf80e5077e5d06 + commit: ae6cebca5bac9521230c69fed23b375d0de7f5f6 layers: meta: meta-poky: @@ -42,17 +42,13 @@ repos: path: "patches/0002-congatec-new-override-syntax.patch" meta-clang: url: "https://github.com/kraj/meta-clang.git" - commit: 989ff6a4e7db59f01d511727135610006124ead2 + commit: e7dceb1c92caf7f21ef1d7b49c85328c30cffd90 meta-intel: url: "https://git.yoctoproject.org/git/meta-intel" - commit: bdb3a52062a1290302674c05398e950f915d10f9 - patches: - 0005-downgrade_openvino_to_2023.3.0: - repo: "meta-nao" - path: "patches/0005-downgrade_openvino_to_2023.3.0.patch" + commit: c8cd0317ec19332bce86697f3413a82b9828b329 meta-openembedded: url: "https://git.openembedded.org/meta-openembedded" - commit: cf942682b8ff5b30393f1f60a1a4d37571c0d1ba + commit: 4a7bb77f7ebe0ac8be5bab5103d8bd993e17e18d layers: meta-oe: meta-multimedia: diff --git a/kas/hulks.yml b/kas/hulks.yml new file mode 100644 index 0000000..b458d74 --- /dev/null +++ b/kas/hulks.yml @@ -0,0 +1,12 @@ +header: + version: 14 + +distro: HULKs-OS +local_conf_header: + meta-hulks: | + SDK_TOOLCHAIN_LANGS ?= "rust" + +repos: + meta-nao: + layers: + meta-hulks: diff --git a/meta-hulks/conf/distro/HULKs-OS.conf b/meta-hulks/conf/distro/HULKs-OS.conf index 7e9fe8a..68b8225 100644 --- a/meta-hulks/conf/distro/HULKs-OS.conf +++ b/meta-hulks/conf/distro/HULKs-OS.conf @@ -4,5 +4,5 @@ SUMMARY = "HULKs flavoured Poky" DISTRO = "HULKs-OS" DISTRO_NAME = "HULKs-OS" -DISTRO_VERSION = "7.4.2" +DISTRO_VERSION = "7.5.0" SDKIMAGE_FEATURES:remove = "dbg-pkgs src-pkgs" diff --git a/meta-hulks/recipes-core/images/nao-image.bbappend b/meta-hulks/recipes-core/images/nao-image.bbappend index f62fd10..2a75403 100644 --- a/meta-hulks/recipes-core/images/nao-image.bbappend +++ b/meta-hulks/recipes-core/images/nao-image.bbappend @@ -11,6 +11,7 @@ CORE_IMAGE_EXTRA_INSTALL += "\ iproute2 \ jq \ libxml2-utils \ + libcap-bin \ libogg \ libopus \ nano \ diff --git a/meta/conf/distro/nao-core-minimal.conf b/meta/conf/distro/nao-core-minimal.conf index 547848a..be60e9e 100644 --- a/meta/conf/distro/nao-core-minimal.conf +++ b/meta/conf/distro/nao-core-minimal.conf @@ -5,7 +5,7 @@ SUMMARY = "A small image just capable of allowing a device to boot." DISTRO = "nao-core-minimal" DISTRO_NAME = "nao-core-minimal" DISTRO_VERSION = "2.0" -SDK_NAME = "${DISTRO}" +SDK_NAME = "${DISTRO}-${SDKMACHINE}" TARGET_VENDOR = "-aldebaran" SDK_VENDOR = "-naosdk" SDK_ARCHIVE_TYPE = "tar.zst" diff --git a/patches/0005-downgrade_openvino_to_2023.3.0.patch b/patches/0005-downgrade_openvino_to_2023.3.0.patch deleted file mode 100644 index 85dec7d..0000000 --- a/patches/0005-downgrade_openvino_to_2023.3.0.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff --git a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2023.3.0.bb -similarity index 92% -rename from dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb -rename to dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2023.3.0.bb -index 70177c28..51237d32 100644 ---- a/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2024.0.0.bb -+++ b/dynamic-layers/meta-python/recipes-opencv/dldt/openvino-model-optimizer_2023.3.0.bb -@@ -5,9 +5,9 @@ environment, performs static model analysis, and adjusts deep \ - learning models for optimal execution on end-point target devices." - HOMEPAGE = "https://01.org/openvinotoolkit" - --SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2024/0;lfs=0 \ -+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;branch=releases/2023/3;lfs=0 \ - " --SRCREV = "34caeefd07800b59065345d651949efbe8ab6649" -+SRCREV = "ceeafaf64f346c6f14a67c612e131da5c27ef620" - - LICENSE = "Apache-2.0" - LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch -deleted file mode 100644 -index d1851406..00000000 ---- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch -+++ /dev/null -@@ -1,43 +0,0 @@ --From b8c3bae71e6d3417ade5cb537cb1785fd75a75c8 Mon Sep 17 00:00:00 2001 --From: Razvan Apetroaie <117895604+razvanapetroaie@users.noreply.github.com> --Date: Tue, 20 Feb 2024 02:28:14 +0200 --Subject: [PATCH] [CPU] Solving the build failure caused by setting the -- "ENABLE_OV_ONNX_FRONTEND" option to "OFF" (#22934) -- --### Details: --See the [ticket --description](https://jira.devtools.intel.com/browse/CVS-132119). The --solution was checked only on a local setup on Ubuntu, if there's a way --to check that using the CI please let me know (or if you could run the --job and paste the link in the comments I would be grateful). -- --Disclaimer: I'm not a CPU plugin developer, so I can't tell for sure if --this is the ideal fix and no side effects are introduced. Please take --that into account when reviewing/merging. -- --### Tickets: -- - [CVS-132119](https://jira.devtools.intel.com/browse/CVS-132119) -- --Upstream-Status: Backport [https://github.com/openvinotoolkit/openvino/commit/b8c3bae71e6d3417ade5cb537cb1785fd75a75c8] -- --Signed-off-by: Yogesh Tyagi ----- -- src/plugins/intel_cpu/tests/functional/CMakeLists.txt | 2 +- -- 1 file changed, 1 insertion(+), 1 deletion(-) -- --diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt --index db5ae8d01c..6941cb528d 100644 ----- a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt --+++ b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt --@@ -16,7 +16,7 @@ set(LINK_LIBRARIES funcSharedTests cpuSpecificRtInfo openvino::snippets ov_snipp -- if(ENABLE_OV_ONNX_FRONTEND) -- list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}") -- else() --- set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx) --+ set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/custom/extension ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/onnx) -- endif() -- -- if(NOT (ARM OR AARCH64)) ---- --2.34.1 -- -diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch -deleted file mode 100644 -index d251f21b..00000000 ---- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-fix-build-when-using-sysroot.patch -+++ /dev/null -@@ -1,32 +0,0 @@ --From b5dfcf8bc1245e804c847745c237068eb6f19931 Mon Sep 17 00:00:00 2001 --From: Yogesh Tyagi --Date: Fri, 15 Mar 2024 16:28:41 +0800 --Subject: [PATCH] cmake: fix build when using sysroot -- --When cross-compiling against a sysroot, system headers will not be at a place --that starts with /usr. Update conditional check to exclude directories --which have "/usr/include" in them to not add /usr/include as well. -- --Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/23486] -- --Signed-off-by: Yogesh Tyagi ----- -- src/cmake/ov_parallel.cmake | 2 +- -- 1 file changed, 1 insertion(+), 1 deletion(-) -- --diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake --index 3793db98e30..819d3410531 100644 ----- a/src/cmake/ov_parallel.cmake --+++ b/src/cmake/ov_parallel.cmake --@@ -296,7 +296,7 @@ function(ov_set_threading_interface_for TARGET_NAME) -- if(include_directories) -- foreach(include_directory IN LISTS include_directories) -- # cannot include /usr/include headers as SYSTEM --- if(NOT "${include_directory}" MATCHES "^/usr.*$") --+ if(NOT "${include_directory}" MATCHES ".*/usr/include.*$") -- target_include_directories(${TARGET_NAME} SYSTEM -- ${LINK_TYPE} $) -- else() ---- --2.34.1 -- -diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Change-the-working-directory-to-source-to-workaround.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Change-the-working-directory-to-source-to-workaround.patch -new file mode 100644 -index 00000000..e6fe3271 ---- /dev/null -+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-Change-the-working-directory-to-source-to-workaround.patch -@@ -0,0 +1,29 @@ -+From a0ea332df477480f90d9dc841faf71f4b5be892e Mon Sep 17 00:00:00 2001 -+From: Anuj Mittal -+Date: Wed, 29 Nov 2023 12:45:59 +0530 -+Subject: [PATCH 2/4] Change the working directory to source to workaround -+ cython embedding absolute path to the pyx file in output. -+ -+Upstream-Status: Inappropriate [OE build specific] -+ -+Signed-off-by: Anuj Mittal -+--- -+ .../python/src/compatibility/openvino/cmake/UseCython.cmake | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake -+index 03a208f03c2..be9af591b34 100644 -+--- a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake -++++ b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake -+@@ -258,7 +258,7 @@ function( compile_pyx _name generated_file ) -+ add_custom_command( OUTPUT ${_generated_file} -+ COMMAND ${CYTHON_EXECUTABLE} -+ ARGS ${cxx_arg} ${include_directory_arg} ${version_arg} -+- ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} -++ ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} -w ${CMAKE_CURRENT_SOURCE_DIR} -+ --output-file ${_generated_file} ${pyx_locations} -+ DEPENDS ${pyx_locations} ${pxd_dependencies} ${pxi_dependencies} -+ IMPLICIT_DEPENDS ${pyx_lang} ${c_header_dependencies} -+-- -+2.34.1 -+ -diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.3.0.bb -similarity index 97% -rename from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb -rename to dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.3.0.bb -index 495a4786..7e741d24 100644 ---- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb -+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2023.3.0.bb -@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=https;branch=mast - file://0001-use-oe-gflags.patch \ - " - --SRCREV = "37f60eb7fe1dcdedc552b2fb184d646723ed5e80" -+SRCREV = "e8fb4cd86a516ce5765290e9665f8afe87b79b2e" - - LICENSE = "Apache-2.0" - LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.3.0.bb -similarity index 88% -rename from dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb -rename to dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.3.0.bb -index 94edd1b8..e465ab3e 100644 ---- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2024.0.0.bb -+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2023.3.0.bb -@@ -4,7 +4,7 @@ DESCRIPTION = "This toolkit allows developers to deploy pre-trained \ - deep learning models through a high-level C++ Inference Engine API \ - integrated with application logic." - --SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2024/0;lfs=0 \ -+SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=openvino;branch=releases/2023/3;lfs=0 \ - git://github.com/openvinotoolkit/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/onednn;name=mkl;nobranch=1 \ - git://github.com/oneapi-src/oneDNN.git;protocol=https;destsuffix=git/src/plugins/intel_gpu/thirdparty/onednn_gpu;name=onednn;nobranch=1 \ - git://github.com/herumi/xbyak.git;protocol=https;destsuffix=git/thirdparty/xbyak;name=xbyak;branch=master \ -@@ -13,29 +13,26 @@ SRC_URI = "git://github.com/openvinotoolkit/openvino.git;protocol=https;name=ope - git://github.com/protocolbuffers/protobuf.git;protocol=https;destsuffix=git/thirdparty/protobuf/protobuf;name=protobuf;branch=3.20.x \ - git://github.com/gflags/gflags.git;protocol=https;destsuffix=git/thirdparty/gflags/gflags;name=gflags;nobranch=1 \ - git://github.com/madler/zlib.git;protocol=https;destsuffix=git/thirdparty/zlib/zlib;name=zlib;nobranch=1 \ -- git://github.com/openvinotoolkit/mlas.git;protocol=https;destsuffix=git/src/plugins/intel_cpu/thirdparty/mlas;name=mlas;nobranch=1 \ - git://github.com/nodejs/node-api-headers.git;protocol=https;destsuffix=git/node-api-headers-src;name=node-api-headers;nobranch=1 \ - git://github.com/nodejs/node-addon-api.git;protocol=https;destsuffix=git/node-addon-api-src;name=node-addon-api;nobranch=1 \ - file://0001-cmake-yocto-specific-tweaks-to-the-build-process.patch \ -+ file://0002-Change-the-working-directory-to-source-to-workaround.patch \ - file://0003-cmake-Fix-overloaded-virtual-error.patch \ - file://0004-protobuf-allow-target-protoc-to-be-built.patch \ -- file://0001-cmake-fix-build-when-using-sysroot.patch \ -- file://0001-CPU-Solving-the-build-failure-caused-by-setting-the-.patch \ - " - --SRCREV_openvino = "34caeefd07800b59065345d651949efbe8ab6649" --SRCREV_mkl = "f82148befdbdc9576ec721c9d500155ee4de8060" --SRCREV_onednn = "494af5f9921bdae98f1a0e2955fa7d76ff386c4f" -+SRCREV_openvino = "ceeafaf64f346c6f14a67c612e131da5c27ef620" -+SRCREV_mkl = "cb3060bbf4694e46a1359a3d4dfe70500818f72d" -+SRCREV_onednn = "cb77937ffcf5e83b5d1cf2940c94e8b508d8f7b4" - SRCREV_xbyak = "740dff2e866f3ae1a70dd42d6e8836847ed95cc2" - SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" - SRCREV_ade = "0e8a2ccdd34f29dba55894f5f3c5179809888b9e" - SRCREV_protobuf = "fe271ab76f2ad2b2b28c10443865d2af21e27e0e" - SRCREV_gflags = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" --SRCREV_zlib = "09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851" --SRCREV_mlas = "d1bc25ec4660cddd87804fcf03b2411b5dfb2e94" -+SRCREV_zlib = "04f42ceca40f73e2978b50e93806c2a18c1281fc" - SRCREV_node-api-headers = "186e04b5e40e54d7fd1655bc67081cc483f12488" - SRCREV_node-addon-api = "39a25bf27788ff7a7ea5c64978c4dcd1e7b9d80d" --SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api_mlas" -+SRCREV_FORMAT = "openvino_mkl_onednn_xbyak_json_ade_protobuf_gflags_zlib_node-api-headers_node-addon-api" - - LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & Zlib" - LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -@@ -45,7 +42,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://thirdparty/ade/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://thirdparty/gflags/gflags/COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df \ - file://thirdparty/zlib/zlib/LICENSE;md5=b51a40671bc46e961c0498897742c0b8 \ -- file://src/plugins/intel_cpu/thirdparty/mlas/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ - file://src/plugins/intel_cpu/thirdparty/onednn/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ - file://src/plugins/intel_gpu/thirdparty/onednn_gpu/LICENSE;md5=3b64000f6e7d52516017622a37a94ce9 \ - file://node-api-headers-src/LICENSE;md5=6adb2909701d4605b4b2ae1a9b25d8bd \ -@@ -73,6 +69,7 @@ EXTRA_OECMAKE += " \ - -DCPACK_GENERATOR=RPM \ - -DENABLE_SYSTEM_FLATBUFFERS=ON \ - -DENABLE_SYSTEM_SNAPPY=ON \ -+ -DENABLE_MLAS_FOR_CPU=OFF \ - -DFETCHCONTENT_BASE_DIR="${S}" \ - " - -@@ -91,7 +88,7 @@ COMPATIBLE_HOST:libc-musl = "null" - - PACKAGECONFIG ?= "opencl samples" - PACKAGECONFIG[opencl] = "-DENABLE_INTEL_GPU=TRUE, -DENABLE_INTEL_GPU=FALSE, virtual/opencl-icd opencl-headers opencl-clhpp," --PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, patchelf-native, python3 python3-numpy python3-progress" -+PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} -DENABLE_PYTHON_PACKAGING=ON, -DENABLE_PYTHON=OFF, python3-cython-native patchelf-native, python3 python3-numpy python3-progress python3-cython" - PACKAGECONFIG[samples] = "-DENABLE_SAMPLES=ON -DENABLE_COMPILE_TOOL=ON, -DENABLE_SAMPLES=OFF -DENABLE_COMPILE_TOOL=OFF, opencv" - PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" -