summaryrefslogtreecommitdiffstats
path: root/meta/classes/archiver.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/archiver.bbclass')
-rw-r--r--meta/classes/archiver.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 37a21fe61b..1319f4df08 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -315,12 +315,15 @@ python do_unpack_and_patch() {
315 return 315 return
316 ar_outdir = d.getVar('ARCHIVER_OUTDIR') 316 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
317 ar_workdir = d.getVar('ARCHIVER_WORKDIR') 317 ar_workdir = d.getVar('ARCHIVER_WORKDIR')
318 ar_sysroot_native = d.getVar('STAGING_DIR_NATIVE')
318 pn = d.getVar('PN') 319 pn = d.getVar('PN')
319 320
320 # The kernel class functions require it to be on work-shared, so we dont change WORKDIR 321 # The kernel class functions require it to be on work-shared, so we dont change WORKDIR
321 if not (bb.data.inherits_class('kernel-yocto', d) or pn.startswith('gcc-source')): 322 if not (bb.data.inherits_class('kernel-yocto', d) or pn.startswith('gcc-source')):
322 # Change the WORKDIR to make do_unpack do_patch run in another dir. 323 # Change the WORKDIR to make do_unpack do_patch run in another dir.
323 d.setVar('WORKDIR', ar_workdir) 324 d.setVar('WORKDIR', ar_workdir)
325 # Restore the original path to recipe's native sysroot (it's relative to WORKDIR).
326 d.setVar('STAGING_DIR_NATIVE', ar_sysroot_native)
324 327
325 # The changed 'WORKDIR' also caused 'B' changed, create dir 'B' for the 328 # The changed 'WORKDIR' also caused 'B' changed, create dir 'B' for the
326 # possibly requiring of the following tasks (such as some recipes's 329 # possibly requiring of the following tasks (such as some recipes's