summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Ceresoli <luca.ceresoli@bootlin.com>2022-06-23 16:13:59 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-06-23 15:18:46 +0000
commit7f6d0c063b1c34fcf6440494719144684c257844 (patch)
treef269d228c09cac78bd942c75af3eaad90090616d
parent418a52ca8a43e0096f96aa50c6ee09035ba71a80 (diff)
downloadmeta-freescale-7f6d0c063b1c34fcf6440494719144684c257844.tar.gz
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 <luca.ceresoli@bootlin.com> (cherry picked from commit 6af01cbe82d06d42baeef8bd2582f26042bca9ee)
-rw-r--r--recipes-bsp/isp-imx/isp-imx_4.2.2.16.0.bb18
1 files 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 b8cd5033..2d99496e 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() {
58 install -d ${D}/${includedir} 58 install -d ${D}/${includedir}
59 install -d ${D}/opt/imx8-isp/bin 59 install -d ${D}/opt/imx8-isp/bin
60 60
61 cp -r ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin 61 cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin
62 cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin 62 cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin
63 cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin 63 cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
64 cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin 64 cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
65 cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} 65 cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir}
66 cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} 66 cp -r ${B}/generated/release/include/* ${D}/${includedir}
67 67
68 cp ${WORKDIR}/${BP}/imx/run.sh ${D}/opt/imx8-isp/bin 68 cp ${S}/imx/run.sh ${D}/opt/imx8-isp/bin
69 cp ${WORKDIR}/${BP}/imx/start_isp.sh ${D}/opt/imx8-isp/bin 69 cp ${S}/imx/start_isp.sh ${D}/opt/imx8-isp/bin
70 70
71 chmod +x ${D}/opt/imx8-isp/bin/run.sh 71 chmod +x ${D}/opt/imx8-isp/bin/run.sh
72 chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh 72 chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh
73 73
74 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 74 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
75 install -d ${D}${systemd_system_unitdir} 75 install -d ${D}${systemd_system_unitdir}
76 install -m 0644 ${WORKDIR}/${BP}/imx/imx8-isp.service ${D}${systemd_system_unitdir} 76 install -m 0644 ${S}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
77 fi 77 fi
78} 78}
79 79