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:07:57 +0000 |
commit | 2b3db17bd855eb10bbb25fed8697167494ff575a (patch) | |
tree | c544b26c194218a06aab978f200bb317ddf5a542 /meta | |
parent | a81c669973ea5ce225e730580e25a3e1bde1a45a (diff) | |
download | poky-2b3db17bd855eb10bbb25fed8697167494ff575a.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)
(From OE-Core rev: 60f2c790d5e83c1a55d7a40b32a7cef6a5a5eab6)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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() { | |||
222 | python do_ar_configured() { | 222 | python 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...') |