aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2017-10-12 03:37:33 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 23:52:02 +0100
commitb129af957a9fd8f603d1aebb9fca3adcb4e6b341 (patch)
tree27aebdfc8fccceeaa337d5f7f0a81af3e62bc302
parent979699b55214933e0f11727a2fb9bfda8a3a3870 (diff)
downloadopenembedded-core-b129af957a9fd8f603d1aebb9fca3adcb4e6b341.tar.gz
openembedded-core-b129af957a9fd8f603d1aebb9fca3adcb4e6b341.tar.bz2
openembedded-core-b129af957a9fd8f603d1aebb9fca3adcb4e6b341.zip
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] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/archiver.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 18c5b96689..ec80ad47a4 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'))