summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Antonov <Anton.Antonov@arm.com>2022-08-18 09:08:58 +0100
committerArmin Kuster <akuster808@gmail.com>2022-08-25 08:17:39 -0400
commit64b64696a9deef8a6bdeacab8137b6305c4750b7 (patch)
tree8e5f5e0d28e61d05781a000495acea0d2bf7f28e
parentaa57a13788b33df008bc58f239abd43b7941b122 (diff)
downloadmeta-security-64b64696a9deef8a6bdeacab8137b6305c4750b7.tar.gz
Use CARGO_TARGET_SUBDIR in do_install
Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
-rw-r--r--meta-parsec/recipes-parsec/parsec-service/parsec-service_1.0.0.bb2
-rw-r--r--meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.5.2.bb2
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"
45do_install () { 45do_install () {
46 # Binaries 46 # Binaries
47 install -d -m 700 -o parsec -g parsec "${D}${libexecdir}/parsec" 47 install -d -m 700 -o parsec -g parsec "${D}${libexecdir}/parsec"
48 install -m 700 -o parsec -g parsec "${WORKDIR}/build/target/${CARGO_TARGET_SUBDIR}/parsec" ${D}${libexecdir}/parsec/parsec 48 install -m 700 -o parsec -g parsec "${B}/target/${CARGO_TARGET_SUBDIR}/parsec" ${D}${libexecdir}/parsec/parsec
49 49
50 # Config file 50 # Config file
51 install -d -m 700 -o parsec -g parsec "${D}${sysconfdir}/parsec" 51 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"
11 11
12do_install() { 12do_install() {
13 install -d ${D}/${bindir} 13 install -d ${D}/${bindir}
14 install -m 755 "${B}/target/${TARGET_SYS}/release/parsec-tool" "${D}${bindir}/parsec-tool" 14 install -m 755 "${B}/target/${CARGO_TARGET_SUBDIR}/parsec-tool" "${D}${bindir}/parsec-tool"
15 install -m 755 "${S}/tests/parsec-cli-tests.sh" "${D}${bindir}/parsec-cli-tests.sh" 15 install -m 755 "${S}/tests/parsec-cli-tests.sh" "${D}${bindir}/parsec-cli-tests.sh"
16} 16}
17 17