]> code.ossystems Code Review - meta-freescale.git/commitdiff
isp-imx: don't deploy files also deployed by basler-camera 906/head
authorMax Krummenacher <max.krummenacher@toradex.com>
Mon, 1 Nov 2021 11:04:33 +0000 (12:04 +0100)
committerMax Krummenacher <max.krummenacher@toradex.com>
Tue, 2 Nov 2021 18:30:14 +0000 (19:30 +0100)
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>
recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb

index 379536fd8875c5297d7e3d9cafbd8120b7abd275..9ede07bd82f225cb820b4457c3eafca79f559d5b 100644 (file)
@@ -60,7 +60,6 @@ do_install() {
     cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin
     cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
     cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
-    cp -r ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin
     cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir}
     cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir}