summaryrefslogtreecommitdiffstats
path: root/meta/conf/multilib.conf
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-12-17 08:02:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-30 23:38:12 +0000
commitaa05f1ded71366b86eda7fce24d8b5395e85ada2 (patch)
treedd67b9074eb091d61c2978068628892033c5b76c /meta/conf/multilib.conf
parent4dccab7639da56a5ae6dcc02f4aac552f06da981 (diff)
downloadopenembedded-core-contrib-aa05f1ded71366b86eda7fce24d8b5395e85ada2.tar.gz
multilib.conf: Ensure that RECIPE_SYSROOT is unchanged for native
Ensure that RECIPE_SYSROOT is the same for -native recipes whether multilib.conf is included or not. Without this change task signatures for -native recipes change when switching between MACHINEs that require multilib.conf and those that don't. This fix was one of the ones suggested by Khem Raj in http://lists.openembedded.org/pipermail/openembedded-core/2019-December/290303.html Add test_sstate_multilib_or_not_native_samesigs test case to sstatetests.py to ensure that this stays fixed. Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/multilib.conf')
-rw-r--r--meta/conf/multilib.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index cfed3fbbd0..58f2ac5c86 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -9,6 +9,7 @@ MULTILIBS ??= "multilib:lib32"
STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
+RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot"
INHERIT += "multilib_global"