diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2019-09-18 16:21:32 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-19 10:54:26 +0100 |
commit | e3caee8f86f2cca1d052f1f1b233018a3d4baa97 (patch) | |
tree | 4e08875a9d2b4efaae6880e4cf22e91962fc25c4 | |
parent | c9f474e654434fec136315fb647c3c6c518d158d (diff) | |
download | openembedded-core-contrib-e3caee8f86f2cca1d052f1f1b233018a3d4baa97.tar.gz |
classes/archiver: Fix WORKDIR for shared source
When archiving patched source, WORKDIR should only be changed to
${ARCHIVER_WORKDIR} if the recipe doesn't use a shared work directory.
This matches the behavior of do_unpack_and_patch for these recipes.
This fixes kernel recipes that set S = "${WORKDIR}/git"
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/archiver.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 13b05bb5f2..093e2d95af 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -221,9 +221,10 @@ python do_ar_patched() { # Get the ARCHIVER_OUTDIR before we reset the WORKDIR ar_outdir = d.getVar('ARCHIVER_OUTDIR') - ar_workdir = d.getVar('ARCHIVER_WORKDIR') + if not is_work_shared(d): + ar_workdir = d.getVar('ARCHIVER_WORKDIR') + d.setVar('WORKDIR', ar_workdir) bb.note('Archiving the patched source...') - d.setVar('WORKDIR', ar_workdir) create_tarball(d, d.getVar('S'), 'patched', ar_outdir) } |