[oe-commits] [openembedded-core] 06/21: archiver: preserve sysroot paths in configured mode for multilib

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit b129af957a9fd8f603d1aebb9fca3adcb4e6b341
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: 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 at 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]
    
    Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/archiver.bbclass | 2 ++
 1 file changed, 2 insertions(+)

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'))
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.