[oe-commits] [openembedded-core] 26/26: classes/archiver: Fix WORKDIR for shared source

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit e3caee8f86f2cca1d052f1f1b233018a3d4baa97
Author: Joshua Watt <jpewhacker at gmail.com>
AuthorDate: Wed Sep 18 16:21:32 2019 -0500

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/archiver.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 13b05bb..093e2d9 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)
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.