]> code.ossystems Code Review - meta-freescale.git/commit
opencv: Fix SRC_URI
authorTom Hochstein <tom.hochstein@nxp.com>
Tue, 4 May 2021 15:49:07 +0000 (10:49 -0500)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 4 May 2021 17:22:03 +0000 (14:22 -0300)
commit963417fdaa914ee07badba4eb1fb83bf13e00403
tree487a8f5a954a5c24214aa9e965b5d1a9909dfa7c
parent6d8bad4a08dbc404774091257ee859b51adbb0ff
opencv: Fix SRC_URI

The SRC_URI is updated for the base recipe, but the copy of the SRC_URI
in the override section doesn't account for this, leading to a build break:

```
| -- wechat_qrcode: Download: detect.caffemodel
| CMake Error at /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-mx8mp-fsl-linux/opencv/4.5.2.imx-r0/git/cmake/OpenCVDownload.cmake:161 (message):
|   Not going to download detect.caffemodel
```

Additionally, the SRC_URI is long and complex, and copying it in our
override section does make problems like this more likely.

Fix the problem and simplify maintenance by replacing the SRC_URI copy
with a targetted override. The override section now shows only the
changes to SRC_URI.

The fix includes these related changes:
- a new patch file is added in the base recipe and is now copied locally
- the override for SRCREV_contrib is redundant and is dropped

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 7462ae5636ebd8551350253d2bb1c3047431ba0d)
recipes-support/opencv/opencv/0001-sfm-link-with-Glog_LIBS.patch [new file with mode: 0644]
recipes-support/opencv/opencv_4.5.2.imx.bb