From ce1f9ddf9e02d71c2336e7b29ce7f195cef45cb0 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 27 Apr 2021 17:38:20 -0500 Subject: [PATCH] isp-imx: Cleanup packaging Rework the packaging section of the recipe, reducing the packaging overrides to a minimum to handle a) installation to /opt, and b) the mix of versioned and unversioned libraries. Signed-off-by: Tom Hochstein (cherry picked from commit aeb17125b4e3d6b1f390271a389c70dc4c615400) --- recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb index 53894baf..b106b985 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb @@ -70,12 +70,16 @@ do_install() { RDEPENDS_${PN} = "libdrm libpython3" -PACKAGES = "${PN} ${PN}-dev ${PN}-dbg" - -FILES_${PN} = "${libdir} /opt ${systemd_system_unitdir}/imx8-isp.service" -FILES_${PN}-dbg += "${libdir}/.debug" +# The build contains a mix of versioned and unversioned libraries, so +# the default packaging configuration needs some modifications +FILES_SOLIBSDEV = "" +FILES_${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" +FILES_${PN}-dev += " \ + ${libdir}/libjsoncpp.so \ + ${libdir}/libos08a20.so \ + ${libdir}/libov2775.so \ +" -INSANE_SKIP_${PN} += "rpaths dev-deps dev-so" -INSANE_SKIP_${PN}-dev += "rpaths dev-elf" +INSANE_SKIP_${PN} = "rpaths" COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" -- 2.40.1