Drop a patch that has been merged and include another that was accidently left off during the last upgrade.
Signed-off-by: Anuj Mittal <[email protected]> --- .../0001-switch-to-python3.patch | 38 ------------------- ...zoo_2021.1.bb => open-model-zoo_2021.2.bb} | 4 +- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch rename dynamic-layers/openembedded-layer/recipes-support/opencv/{open-model-zoo_2021.1.bb => open-model-zoo_2021.2.bb} (95%) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch deleted file mode 100644 index 8bfb9ac9..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4dd5d9c7042b421c929bece05ee162b8827dc568 Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Mon, 2 Nov 2020 11:44:33 +0800 -Subject: [PATCH] switch to python3 - -Upstream-Status: Submitted -[https://github.com/openvinotoolkit/open_model_zoo/pull/1701/commits/0261e21e63b84cc4e91b220f4a84ec52b5678e2c; -https://github.com/gflags/gflags/pull/318#issuecomment-719466350] - -Signed-off-by: Changqing Li <[email protected]> ---- - .../speech_recognition_demo/speech_recognition_demo.py | 2 +- - thirdparty/gflags/test/gflags_build.py.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python_demos/speech_recognition_demo/speech_recognition_demo.py b/python_demos/speech_recognition_demo/speech_recognition_demo.py -index 6e8ff534..d28ccddc 100755 ---- a/python_demos/speech_recognition_demo/speech_recognition_demo.py -+++ b/python_demos/speech_recognition_demo/speech_recognition_demo.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (C) 2019-2020 Intel Corporation - # SPDX-License-Identifier: Apache-2.0 -diff --git a/thirdparty/gflags/test/gflags_build.py.in b/thirdparty/gflags/test/gflags_build.py.in -index a8cba2bf..559163ef 100644 ---- a/thirdparty/gflags/test/gflags_build.py.in -+++ b/thirdparty/gflags/test/gflags_build.py.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import os - import sys --- -2.17.1 - diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb similarity index 95% rename from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb rename to dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb index c5efbfc8..6784d0d8 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb @@ -5,10 +5,10 @@ models and a set of demos to expedite development of high-performance \ deep learning inference applications." SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ - file://0001-switch-to-python3.patch \ + file://0001-use-oe-gflags.patch;striplevel=2 \ " -SRCREV = "75ec8ad4b6c4fd7fb161ae9d2c3056281b2443de" +SRCREV = "338630987b403a6981d03ab6d04c2d5ad367793a" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ -- 2.29.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6908): https://lists.yoctoproject.org/g/meta-intel/message/6908 Mute This Topic: https://lists.yoctoproject.org/mt/80374230/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
