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:49:55 +0100
commitaa2240657b015d46e9ba4bcb6264709a82313d83 (patch)
tree1380df7dbe7355c469b972fa8a09b78efc12ec7b
parent0af636c635391b30c987dedeffe597ef4f8a1ed8 (diff)
downloadopenembedded-core-contrib-aa2240657b015d46e9ba4bcb6264709a82313d83.tar.gz
openembedded-core-contrib-aa2240657b015d46e9ba4bcb6264709a82313d83.tar.bz2
openembedded-core-contrib-aa2240657b015d46e9ba4bcb6264709a82313d83.zip
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 ] Signed-off-by: Ross Burton <ross.burton@intel.com>
-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() {
python do_ar_configured() {
import shutil
+ # Forcibly expand the sysroot paths as we're about to change WORKDIR
+ d.setVar('RECIPE_SYSROOT', d.getVar('RECIPE_SYSROOT'))
+ d.setVar('RECIPE_SYSROOT_NATIVE', d.getVar('RECIPE_SYSROOT_NATIVE'))
+
ar_outdir = d.getVar('ARCHIVER_OUTDIR')
if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured':
bb.note('Archiving the configured source...')