From 50de0ece01fe9f1802aee40c372031976f6cea57 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Thu, 23 Jun 2022 16:13:59 +0200 Subject: isp-imx: fix source and build directories The source and build directories are usually ${WORKDIR}/build and ${WORKDIR}/${BP} but not always. For example when using devtool they are different, leading to install failures such as: cp: cannot stat '.../tmp/work/.../isp-imx/4.2.2.16.0-r0/build/generated/release/bin/*_test': No such file or directory Fix by using the S and B variables which always point to the correct directory. Signed-off-by: Luca Ceresoli (cherry picked from commit 6af01cbe82d06d42baeef8bd2582f26042bca9ee) --- recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb index 5d544ede..8fafd419 100644 --- a/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb @@ -58,22 +58,22 @@ do_install() { install -d ${D}/${includedir} install -d ${D}/opt/imx8-isp/bin - cp -r ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin - 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}/build/generated/release/lib/*.so* ${D}/${libdir} - cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} + cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin + cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} + cp -r ${B}/generated/release/include/* ${D}/${includedir} - cp ${WORKDIR}/${BP}/imx/run.sh ${D}/opt/imx8-isp/bin - cp ${WORKDIR}/${BP}/imx/start_isp.sh ${D}/opt/imx8-isp/bin + cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin + cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin chmod +x ${D}/opt/imx8-isp/bin/run.sh chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/${BP}/imx/imx8-isp.service ${D}${systemd_system_unitdir} + install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir} fi } -- cgit v1.2.3-54-g00ecf