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) (From OE-Core rev: cd5e6172525c7618e93d8255a1d6102a24496f53) (From OE-Core rev: 60f2c790d5e83c1a55d7a40b32a7cef6a5a5eab6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a81c669973
commit
2b3db17bd8
|
@ -222,6 +222,10 @@ python do_ar_patched() {
|
||||||
python do_ar_configured() {
|
python do_ar_configured() {
|
||||||
import shutil
|
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')
|
ar_outdir = d.getVar('ARCHIVER_OUTDIR')
|
||||||
if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured':
|
if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured':
|
||||||
bb.note('Archiving the configured source...')
|
bb.note('Archiving the configured source...')
|
||||||
|
|
Loading…
Reference in New Issue