opencv_4.5.2: Fix opencv fetch issue

When fetch opencv source, it meets ERROR/WARNING as:
    "ERROR: opencv-4.5.2.imx-r0 do_fetch: Fetcher failure for URL: 'git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib'. Unable to fetch from any source.
    or
    "WARNING: opencv-4.5.2.imx-r0 do_fetch: Failed to fetch URL git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib, attempting MIRRORS if available."

- Use nobranch=1 to avoid the missing commit on master branch.
- Use protocol=https for Github urls.

Signed-off-by: Mingyang Wang <mingyang.wang@nxp.com>
Signed-off-by: Jun Zhu <junzhu@nxp.com>
This commit is contained in:
Mingyang Wang 2023-08-29 14:35:23 +08:00 committed by Jun Zhu
parent 2c7cd09a06
commit 6d423b9034
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,21 @@
SRC_URI_remove = "git://github.com/opencv/opencv.git;name=opencv"
SRC_URI_remove = "git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib"
SRC_URI_remove = "git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp"
SRC_URI_remove = "git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc"
SRC_URI_remove = "git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg"
SRC_URI_remove = "git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face"
SRC_URI_remove = "git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode"
# i.MX 6&7 uses the OpenSource git repository and i.MX 8 uses the NXP fork
ADDONURL = "git://github.com/opencv/opencv.git;name=opencv;protocol=https;nobranch=1"
ADDONURL_mx8 = ""
# Add protocol=https and nobranch=1
SRC_URI +="${ADDONURL} \
git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;protocol=https;nobranch=1 \
git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \
git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \
"

View File

@ -1,4 +1,9 @@
OPENCV_SRC = "git://github.com/nxp-imx/opencv-imx.git;protocol=https"
SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998"
# i.MX 8 build includes opencv_extra, add protocol=https;nobranch=1 to fetch
SRC_URI_remove = "git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra"
SRC_URI += "git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;protocol=https;nobranch=1"
PACKAGECONFIG_OPENCL_mx8mnul = ""
PACKAGECONFIG_OPENCL_mx8mpul = ""