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

[Emmanuele Bassi <ebassi src gnome org>]

commit 75f3ce2d4715d9c6bcf5412d9064ae31fa9f8187
Author: Hongxu Jia <hongxu jia windriver com>
Date:   Thu Oct 12 03:37:33 2017 -0400

    archiver: preserve sysroot paths in configured mode for multilib
    
    In the following commit, the archiver expanded RECIPE_SYSROOT
    to preserve sysroot paths in configured mode:
    ...
    commit aa2240657b015d46e9ba4bcb6264709a82313d83
    Author: Ross Burton <ross burton intel com>
    Date:   Tue Jun 6 15:23:18 2017 +0100
    
        archiver: preserve sysroot paths in configured mode
    ...
    
    In meta/conf/multilib.conf, it overrides the variables
    of STAGING_DIR_HOST, STAGING_DIR_TARGET and RECIPE_SYSROOT
    with "${WORKDIR}/${MLPREFIX}recipe-sysroot".
    
    So the archiver should also expand STAGING_DIR_HOST and
    STAGING_DIR_TARGET to preserve sysroot paths in configured mode for
    multilib.
    
    [YOCTO #11584]
    
    (From OE-Core rev: b129af957a9fd8f603d1aebb9fca3adcb4e6b341)
    
    Signed-off-by: Hongxu Jia <hongxu jia windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/archiver.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 18c5b96..ec80ad4 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -223,6 +223,8 @@ python do_ar_configured() {
     import shutil
 
     # Forcibly expand the sysroot paths as we're about to change WORKDIR
+    d.setVar('STAGING_DIR_HOST', d.getVar('STAGING_DIR_HOST'))
+    d.setVar('STAGING_DIR_TARGET', d.getVar('STAGING_DIR_TARGET'))
     d.setVar('RECIPE_SYSROOT', d.getVar('RECIPE_SYSROOT'))
     d.setVar('RECIPE_SYSROOT_NATIVE', d.getVar('RECIPE_SYSROOT_NATIVE'))