summaryrefslogtreecommitdiffstats
path: root/meta/classes/archiver.bbclass
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-09-18 16:21:32 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 10:54:33 +0100
commitec33280c00c75f8f3cbcfbd65500b8f946129155 (patch)
tree64f76ad6c4b19934449613813a5e1898ff84bbc6 /meta/classes/archiver.bbclass
parent9cbfaf790f165076df3ddc5d471da1d980840d84 (diff)
downloadpoky-ec33280c00c75f8f3cbcfbd65500b8f946129155.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" (From OE-Core rev: e3caee8f86f2cca1d052f1f1b233018a3d4baa97) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/archiver.bbclass')
-rw-r--r--meta/classes/archiver.bbclass5
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() {
221 221
222 # Get the ARCHIVER_OUTDIR before we reset the WORKDIR 222 # Get the ARCHIVER_OUTDIR before we reset the WORKDIR
223 ar_outdir = d.getVar('ARCHIVER_OUTDIR') 223 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
224 ar_workdir = d.getVar('ARCHIVER_WORKDIR') 224 if not is_work_shared(d):
225 ar_workdir = d.getVar('ARCHIVER_WORKDIR')
226 d.setVar('WORKDIR', ar_workdir)
225 bb.note('Archiving the patched source...') 227 bb.note('Archiving the patched source...')
226 d.setVar('WORKDIR', ar_workdir)
227 create_tarball(d, d.getVar('S'), 'patched', ar_outdir) 228 create_tarball(d, d.getVar('S'), 'patched', ar_outdir)
228} 229}
229 230