diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-02-04 12:25:06 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-02-04 13:40:55 +0800 |
commit | d4b48224eff9f287fd06871b1a4a3b0780cfcc99 (patch) | |
tree | 577c8c5abcc61daa3572cee19cf49436e3b9f011 /dynamic-layers/openembedded-layer/recipes-support/opencv | |
parent | 0e8b3cd2c50b0b0ceb9553dcb165113593390c74 (diff) | |
download | meta-intel-d4b48224eff9f287fd06871b1a4a3b0780cfcc99.tar.gz |
open-model-zoo: upgrade 2021.1 -> 2021.2
Drop a patch that has been merged and include another that was
accidently left off during the last upgrade.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-switch-to-python3.patch | 38 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.2.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.1.bb) | 4 |
2 files changed, 2 insertions, 40 deletions
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 @@ | |||
1 | From 4dd5d9c7042b421c929bece05ee162b8827dc568 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 2 Nov 2020 11:44:33 +0800 | ||
4 | Subject: [PATCH] switch to python3 | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | [https://github.com/openvinotoolkit/open_model_zoo/pull/1701/commits/0261e21e63b84cc4e91b220f4a84ec52b5678e2c; | ||
8 | https://github.com/gflags/gflags/pull/318#issuecomment-719466350] | ||
9 | |||
10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
11 | --- | ||
12 | .../speech_recognition_demo/speech_recognition_demo.py | 2 +- | ||
13 | thirdparty/gflags/test/gflags_build.py.in | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/python_demos/speech_recognition_demo/speech_recognition_demo.py b/python_demos/speech_recognition_demo/speech_recognition_demo.py | ||
17 | index 6e8ff534..d28ccddc 100755 | ||
18 | --- a/python_demos/speech_recognition_demo/speech_recognition_demo.py | ||
19 | +++ b/python_demos/speech_recognition_demo/speech_recognition_demo.py | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/usr/bin/env python | ||
22 | +#!/usr/bin/env python3 | ||
23 | # | ||
24 | # Copyright (C) 2019-2020 Intel Corporation | ||
25 | # SPDX-License-Identifier: Apache-2.0 | ||
26 | diff --git a/thirdparty/gflags/test/gflags_build.py.in b/thirdparty/gflags/test/gflags_build.py.in | ||
27 | index a8cba2bf..559163ef 100644 | ||
28 | --- a/thirdparty/gflags/test/gflags_build.py.in | ||
29 | +++ b/thirdparty/gflags/test/gflags_build.py.in | ||
30 | @@ -1,4 +1,4 @@ | ||
31 | -#!/usr/bin/env python | ||
32 | +#!/usr/bin/env python3 | ||
33 | |||
34 | import os | ||
35 | import sys | ||
36 | -- | ||
37 | 2.17.1 | ||
38 | |||
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 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 \ | |||
5 | deep learning inference applications." | 5 | deep learning inference applications." |
6 | 6 | ||
7 | SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ | 7 | SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master \ |
8 | file://0001-switch-to-python3.patch \ | 8 | file://0001-use-oe-gflags.patch;striplevel=2 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRCREV = "75ec8ad4b6c4fd7fb161ae9d2c3056281b2443de" | 11 | SRCREV = "338630987b403a6981d03ab6d04c2d5ad367793a" |
12 | 12 | ||
13 | LICENSE = "Apache-2.0" | 13 | LICENSE = "Apache-2.0" |
14 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | 14 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ |