From a597de10ea52ce415a41ff1f3864967b302e97c7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 19 Dec 2019 08:42:51 -0800 Subject: dfu-util-native,sjf2410-linux-native: Fix Deploy in multimachine builds When more than two machine are built using same tmpdir and happen to use these tools the builds fail Fixes ERROR: The recipe dfu-util-native is trying to install files into a shared area when those files already exist. Those files and their manifest location are: TOPDIR/build/tmp/deploy/tools/dfu-util-0.9 (matched in manifest-qemumips-dfu-util-native.deploy) Please verify which recipe should provide the above files. Signed-off-by: Khem Raj --- meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb | 9 ++++++++- .../samsung-soc-utils/sjf2410-linux-native_svn.bb | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb index 76faefefbb..feb16fa730 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb @@ -8,7 +8,6 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[static] = "CFLAGS='${CFLAGS} -pthread -static',," -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" do_deploy() { install -m 0755 src/dfu-util ${DEPLOYDIR}/dfu-util-${PV} rm -f ${DEPLOYDIR}/dfu-util @@ -16,3 +15,11 @@ do_deploy() { } addtask deploy before do_package after do_install + +do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" +# cleandirs should possibly be in deploy.bbclass but we need it +do_deploy[cleandirs] = "${DEPLOYDIR}" +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass +do_deploy[stamp-extra-info] = "" + diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb index 9e609c4dd8..3a5172eecc 100644 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb @@ -13,7 +13,6 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol= S = "${WORKDIR}/sjf2410-linux" inherit native deploy -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" CFLAGS += "-DLINUX_PPDEV" @@ -31,3 +30,11 @@ do_deploy() { } addtask deploy before do_build after do_install + +do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" +# cleandirs should possibly be in deploy.bbclass but we need it +do_deploy[cleandirs] = "${DEPLOYDIR}" +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass +do_deploy[stamp-extra-info] = "" + -- cgit v1.2.3-54-g00ecf