CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dfu-util-native,sjf2410-linux-native: Fix Deploy in multimachine builds

Browse Source 
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 <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2019-12-19 08:42:51 -08:00
parent 989b67be6d
commit a597de10ea
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
View File

@ -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] = ""

9
meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
View File

@ -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] = ""