[oe-commits] Clemens Lang : archiver.bbclass: Run deploy_archives in $WORKDIR

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: e22685ff11af6d54c939aa8f327a0aaa1557fbbc
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e22685ff11af6d54c939aa8f327a0aaa1557fbbc

Author: Clemens Lang <clemens.lang at bmw-carit.de>
Date:   Mon Aug 17 10:37:47 2015 +0200

archiver.bbclass: Run deploy_archives in $WORKDIR

In recipes that are exempt from source code archiving due to
COPYLEFT_LICENSE_EXCLUDE, do_deploy_archives does not have a transitive
dependency on do_unpack. Given enough parallelism, this means
do_deploy_archives can run at the same time or before do_unpack.

Because do_deploy_archives did not specify a working directory, its
working directory was ${B}, which defaults to ${S}, which may be set by
a recipe to a directory that is created by do_unpack.

In this case, do_deploy_archives can fail because do_unpack deletes and
re-creates the directory and do_deploy_archives cannot change into the
non-existent directory. Avoid this problem by explicitly specifying
a working directory for do_deploy_archives (and for
do_deploy_all_archives as well for good measure).

Signed-off-by: Clemens Lang <clemens.lang at bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/archiver.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index d908d16..089d707 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -45,6 +45,8 @@ ARCHIVER_WORKDIR = "${WORKDIR}/archiver-work/"
 do_dumpdata[dirs] = "${ARCHIVER_OUTDIR}"
 do_ar_recipe[dirs] = "${ARCHIVER_OUTDIR}"
 do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}"
+do_deploy_archives[dirs] = "${WORKDIR}"
+do_deploy_all_archives[dirs] = "${WORKDIR}"
 
 # This is a convenience for the shell script to use it