From 6ae003543397f12f5386b6477d3881a13a0695b1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 21 Jan 2021 02:27:06 -0800 Subject: [PATCH] iotedge-{cli,daemon}: fix build with newer meta-rust * the binaries are built in ${B} since meta-rust commit: https://github.com/meta-rust/meta-rust/commit/a6733209953a390a09cf2f8e05e412c892815132 adjust do_install to match that Signed-off-by: Martin Jansa --- recipes-core/iotedge-cli/iotedge-cli.inc | 2 +- recipes-core/iotedge-daemon/iotedge-daemon.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-core/iotedge-cli/iotedge-cli.inc b/recipes-core/iotedge-cli/iotedge-cli.inc index 226bba0..652148a 100644 --- a/recipes-core/iotedge-cli/iotedge-cli.inc +++ b/recipes-core/iotedge-cli/iotedge-cli.inc @@ -7,6 +7,6 @@ export LIBIOTHSM_NOBUILD="On" do_install () { # Binaries install -d "${D}${bindir}" - install -m 755 "${WORKDIR}/iotedge-${PV}/edgelet/target/${CARGO_TARGET_SUBDIR}/iotedge" ${D}${bindir}/iotedge + install -m 755 "${B}/target/${CARGO_TARGET_SUBDIR}/iotedge" ${D}${bindir}/iotedge } diff --git a/recipes-core/iotedge-daemon/iotedge-daemon.inc b/recipes-core/iotedge-daemon/iotedge-daemon.inc index 1ff35a9..10894aa 100644 --- a/recipes-core/iotedge-daemon/iotedge-daemon.inc +++ b/recipes-core/iotedge-daemon/iotedge-daemon.inc @@ -18,7 +18,7 @@ INITSCRIPT_PARAMS_${PN} = "defaults" do_install () { # Binaries install -d "${D}${bindir}" - install -m 755 "${WORKDIR}/iotedge-${PV}/edgelet/target/${CARGO_TARGET_SUBDIR}/iotedged" ${D}${bindir}/iotedged + install -m 755 "${B}/target/${CARGO_TARGET_SUBDIR}/iotedged" ${D}${bindir}/iotedged # Config file install -d "${D}${sysconfdir}/iotedge"