summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-06-06 15:23:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-06 19:52:25 +0100
commit84b3d8b33caeb1d8930531f96e06958f13456568 (patch)
tree9071022787ec8d0f1933f621561e13369eee1eee
parentde1b5983c7f36771a0a6bcde8eb1228f3cd6942d (diff)
downloadpoky-84b3d8b33caeb1d8930531f96e06958f13456568.tar.gz
archiver: preserve sysroot paths in configured mode
do_ar_configured alters WORKDIR but also expects to be able to run do_configure, so forcibly expand the paths to the sysroots as otherwise they'll point to a non-existant directory in the temporary WORKDIR. [ YOCTO #11584 ] (From OE-Core rev: aa2240657b015d46e9ba4bcb6264709a82313d83) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/archiver.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 82f0b16138..18c5b96689 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -222,6 +222,10 @@ python do_ar_patched() {
222python do_ar_configured() { 222python do_ar_configured() {
223 import shutil 223 import shutil
224 224
225 # Forcibly expand the sysroot paths as we're about to change WORKDIR
226 d.setVar('RECIPE_SYSROOT', d.getVar('RECIPE_SYSROOT'))
227 d.setVar('RECIPE_SYSROOT_NATIVE', d.getVar('RECIPE_SYSROOT_NATIVE'))
228
225 ar_outdir = d.getVar('ARCHIVER_OUTDIR') 229 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
226 if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured': 230 if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured':
227 bb.note('Archiving the configured source...') 231 bb.note('Archiving the configured source...')