From 64b64696a9deef8a6bdeacab8137b6305c4750b7 Mon Sep 17 00:00:00 2001 From: Anton Antonov Date: Thu, 18 Aug 2022 09:08:58 +0100 Subject: Use CARGO_TARGET_SUBDIR in do_install Signed-off-by: Anton Antonov --- meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb | 2 +- meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb index 84539f9..2a25178 100644 --- a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb +++ b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb @@ -45,7 +45,7 @@ PARSEC_CONFIG ?= "${S}/config.toml" do_install () { # Binaries install -d -m 700 -o parsec -g parsec "${D}${libexecdir}/parsec" - install -m 700 -o parsec -g parsec "${WORKDIR}/build/target/${CARGO_TARGET_SUBDIR}/parsec" ${D}${libexecdir}/parsec/parsec + install -m 700 -o parsec -g parsec "${B}/target/${CARGO_TARGET_SUBDIR}/parsec" ${D}${libexecdir}/parsec/parsec # Config file install -d -m 700 -o parsec -g parsec "${D}${sysconfdir}/parsec" diff --git a/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb b/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb index 4b053b9..6ecce8e 100644 --- a/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb +++ b/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb @@ -11,7 +11,7 @@ RDEPENDS:${PN} = "openssl-bin" do_install() { install -d ${D}/${bindir} - install -m 755 "${B}/target/${TARGET_SYS}/release/parsec-tool" "${D}${bindir}/parsec-tool" + install -m 755 "${B}/target/${CARGO_TARGET_SUBDIR}/parsec-tool" "${D}${bindir}/parsec-tool" install -m 755 "${S}/tests/parsec-cli-tests.sh" "${D}${bindir}/parsec-cli-tests.sh" } -- cgit v1.2.3-54-g00ecf