From 7864daf8ecec559fe144ba3d767768ba7392ec86 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 29 Apr 2024 12:48:11 +0800 Subject: recipes: avoid using WORKDIR in do_install Replace usage of WORKDIR in do_compile/do_install by ${S} or ${B}. It also helps with cases when externalsrc is used like with devtool. Signed-off-by: Anuj Mittal --- .../recipes-support/opencv/open-model-zoo_2024.0.0.bb | 10 +++++----- recipes-core/libxcam/libxcam_1.5.0.bb | 2 +- recipes-support/libipt/libipt_2.1.1.bb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb index 495a4786..4c322f04 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2024.0.0.bb @@ -44,11 +44,11 @@ do_install(){ install -d ${D}${bindir} install -d ${D}${datadir}/openvino/open-model-zoo/tools install -d ${D}${datadir}/openvino/open-model-zoo/demos - cp -rf ${WORKDIR}/build/intel64/Release/*.a ${D}${libdir} - cp -rf ${WORKDIR}/build/intel64/Release/*_demo* ${D}${bindir} - cp -rf ${WORKDIR}/git/models ${D}${datadir}/openvino/open-model-zoo - cp -rf ${WORKDIR}/git/demos ${D}${datadir}/openvino/open-model-zoo - cp -rf ${WORKDIR}/git/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools + cp -rf ${B}/intel64/Release/*.a ${D}${libdir} + cp -rf ${B}/intel64/Release/*_demo* ${D}${bindir} + cp -rf ${S}/models ${D}${datadir}/openvino/open-model-zoo + cp -rf ${S}/demos ${D}${datadir}/openvino/open-model-zoo + cp -rf ${S}/tools/model_tools ${D}${datadir}/openvino/open-model-zoo/tools } FILES:${PN} += "${datadir}/openvino" diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb index 31e9344b..df459d72 100644 --- a/recipes-core/libxcam/libxcam_1.5.0.bb +++ b/recipes-core/libxcam/libxcam_1.5.0.bb @@ -30,7 +30,7 @@ PACKAGECONFIG[dnn] = "--enable-dnn, --disable-dnn," do_install:append () { install -d ${D}${bindir}/libxcam - cp -r ${WORKDIR}/build/tests/.libs/* ${D}${bindir}/libxcam/ + cp -r ${B}/tests/.libs/* ${D}${bindir}/libxcam/ } FILES:${PN} += "${libdir}/gstreamer-*/*.so" diff --git a/recipes-support/libipt/libipt_2.1.1.bb b/recipes-support/libipt/libipt_2.1.1.bb index 205967c1..c4b5ecaa 100644 --- a/recipes-support/libipt/libipt_2.1.1.bb +++ b/recipes-support/libipt/libipt_2.1.1.bb @@ -27,7 +27,7 @@ do_install:append() { install -d ${D}${bindir}/libipt/tests cp -r ${B}/bin/* ${D}${bindir}/libipt/ - cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests + cp -r ${S}/test/src/* ${D}${bindir}/libipt/tests } FILES:${PN}-test = "${bindir}" -- cgit v1.2.3-54-g00ecf