From edbaaa0c3c014124138ddf4044d22ee45fe2b853 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 1 Nov 2021 12:04:33 +0100 Subject: 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 (cherry picked from commit 3d5338c8859e80fcf626ddc7ab039ad1e357783e) --- recipes-bsp/isp-imx/isp-imx_4.2.2.15.0.bb | 1 - 1 file changed, 1 deletion(-) 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() { 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} -- cgit v1.2.3-54-g00ecf