From 7dfa116f64ae6cbe2d957f3d0859c93264fb30de Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 18 Jan 2024 19:28:10 +0100 Subject: basler-camera: update to 4.2.2.24.0 used with lf-6.1.55-2.2.0 The files provided by isp-imx are no longer part of the sources. Drop the fixup to remove them. Signed-off-by: Max Krummenacher --- recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb | 32 ------------------------- recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb create mode 100644 recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb deleted file mode 100644 index ee839cd92..000000000 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.22.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2020-2023 NXP - -DESCRIPTION = "Basler camera binary drivers" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -SRC_URI[md5sum] = "cb5e5a4d1efd1d845464ac9a8c6383b8" -SRC_URI[sha256sum] = "6fe10f5118d18a7cb1dd40e713343ce788ad3766104ad2471ee49aed7b55833a" - -do_install() { - # provided by the isp-imx package, do not install them here additionally - rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_1080P_config.json - rm -f ${S}/opt/imx8-isp/bin/dewarp_config/sensor_dwe_os08a20_4K_config.json - - dest_dir=${D}/opt/imx8-isp/bin - install -d ${D}/${libdir} - install -d $dest_dir - cp -r ${S}/opt/imx8-isp/bin/* $dest_dir - cp -r ${S}/usr/lib/* ${D}/${libdir} -} - -SYSTEMD_AUTO_ENABLE = "enable" - -FILES:${PN} = "${libdir} /opt" -INSANE_SKIP:${PN} = "already-stripped" -RDEPENDS:${PN} += "isp-imx" - -COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb new file mode 100644 index 000000000..0ab440748 --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb @@ -0,0 +1,28 @@ +# Copyright 2020-2023 NXP + +DESCRIPTION = "Basler camera binary drivers" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "31d716e1f40c248556e5a8e6b467ba71" +SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf" + +do_install() { + dest_dir=${D}/opt/imx8-isp/bin + install -d ${D}/${libdir} + install -d $dest_dir + cp -r ${S}/opt/imx8-isp/bin/* $dest_dir + cp -r ${S}/usr/lib/* ${D}/${libdir} +} + +SYSTEMD_AUTO_ENABLE = "enable" + +FILES:${PN} = "${libdir} /opt" +INSANE_SKIP:${PN} = "already-stripped" +RDEPENDS:${PN} += "isp-imx" + +COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From ad7ce250cc9da488f8414d322816a0f07fe1942d Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 18 Jan 2024 19:26:57 +0100 Subject: isp-imx: don't install files for basler cameras The basler-camera recipe/package provides the files for basler cameras. Do not install them with the isp-imx package. Prevents: | * check_data_file_clashes: Package libdaa3840-30mc1 wants to install file .../rootfs/opt/imx8-isp/bin/dewarp_config/daA3840_30mc_1080P.json | But that file is already provided by package * isp-imx | ... Fixes: 9f9b707 ("isp-imx: update to 4.2.2.24.0 used with lf-6.1.55-2.2.0") Signed-off-by: Max Krummenacher --- recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb index 729046135..9e0f02656 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.24.0.bb @@ -54,6 +54,9 @@ do_configure:prepend () { } do_install() { + # FIXME: provided by the basler-camera package, do not install them here additionally + rm -f ${S}/dewarp/dewarp_config//daA3840_30mc*.json + install -d ${D}/${libdir} install -d ${D}/${includedir} install -d ${D}/opt/imx8-isp/bin -- cgit v1.2.3-54-g00ecf