diff options
| author |   Ross Burton <ross.burton@intel.com> | 2017-06-06 15:23:18 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-07 17:06:35 +0000 |
| commit | 60f2c790d5e83c1a55d7a40b32a7cef6a5a5eab6 (patch) | |
| tree | 7a21419fa59d6be350b0a2f7684da1a0704d6b9d | |
| parent | 23d55b31272568ce7d8b4549381c31512ff93b6a (diff) | |
| download | openembedded-core-60f2c790d5e83c1a55d7a40b32a7cef6a5a5eab6.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)
(From OE-Core rev: cd5e6172525c7618e93d8255a1d6102a24496f53)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/archiver.bbclass | 4 |
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...') |