From 2b3db17bd855eb10bbb25fed8697167494ff575a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 6 Jun 2017 15:23:18 +0100 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- meta/classes/archiver.bbclass | 4 ++++ 1 file changed, 4 insertions(+) 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...')