diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-11-01 12:04:33 +0100 |
|---|---|---|
| committer | Chris Dimich <chris.dimich@boundarydevices.com> | 2022-01-27 15:34:42 -0800 |
| commit | edbaaa0c3c014124138ddf4044d22ee45fe2b853 (patch) | |
| tree | 367c10d59f813bd20c6e4fc71b6f205ae2f8dca9 | |
| parent | 4cf4294ae9878af5afef7cfab7033401cc297cdc (diff) | |
| download | meta-freescale-edbaaa0c3c014124138ddf4044d22ee45fe2b853.tar.gz | |
isp-imx: don't deploy files also deployed by basler-camera
The files from dewarp/ are now provided from recipe basler-camera_4.2.2.15.0.
Fixes the following doing do_rootfs:
| * check_data_file_clashes: Package isp-imx wants to install file ...rootfs/opt/imx8-isp/bin/dewarp_config/sensor_dwe_1080P_config.json
| But that file is already provided by package * libdaa3840-30mc1
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 3d5338c8859e80fcf626ddc7ab039ad1e357783e)
| -rw-r--r-- | recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb index 379536fd..9ede07bd 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | |||
| @@ -60,7 +60,6 @@ do_install() { | |||
| 60 | cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin | 60 | cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin |
| 61 | cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin | 61 | cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin |
| 62 | cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin | 62 | cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin |
| 63 | cp -r ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin | ||
| 64 | cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} | 63 | cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} |
| 65 | cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} | 64 | cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} |
| 66 | 65 | ||