[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6149/8267] archiver: preserve sysroot paths in configured mode

[Emmanuele Bassi <ebassi src gnome org>]

commit 84b3d8b33caeb1d8930531f96e06958f13456568
Author: Ross Burton <ross burton intel com>
Date:   Tue Jun 6 15:23:18 2017 +0100

    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)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 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 82f0b16..18c5b96 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...')