From 1c2e0bf0187573643c0640fdce9e2d7b31c33ee4 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 28 Nov 2021 12:21:24 +0100 Subject: opencv: use https protocol and set branch explicitly Github no longer allows a plain git protocol. https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git OE is dropping setting the branch to master implicitly if none is specified. Signed-off-by: Max Krummenacher --- backports/recipes-support/opencv/opencv_4.5.2.imx.bb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'backports') diff --git a/backports/recipes-support/opencv/opencv_4.5.2.imx.bb b/backports/recipes-support/opencv/opencv_4.5.2.imx.bb index 2d71acf..15ad317 100644 --- a/backports/recipes-support/opencv/opencv_4.5.2.imx.bb +++ b/backports/recipes-support/opencv/opencv_4.5.2.imx.bb @@ -44,13 +44,13 @@ IPP_FILENAME = "${@ipp_filename(d)}" IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ - git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode \ +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \ + 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 \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ @@ -243,15 +243,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" # Replace the opencv URL with the fork SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998" -OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https" +OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https;branch=master" SRCBRANCH = "4.5.2_imx" -SRC_URI_remove = "git://github.com/opencv/opencv.git;name=opencv" +SRC_URI_remove = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https" SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv" # Add opencv_extra SRCREV_extra = "855c4528402e563283f86f28c6393f57eb5dcf62" SRC_URI += " \ - git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra \ + git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \ file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ " SRCREV_FORMAT_append = "_extra" -- cgit v1.2.3