From c1ad30fd80740701f7c264381fc2e3e34460927f Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Tue, 17 Dec 2019 08:02:25 +0000 Subject: 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. (From OE-Core rev: aa05f1ded71366b86eda7fce24d8b5395e85ada2) Signed-off-by: Mike Crowe Signed-off-by: Richard Purdie --- meta/conf/multilib.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/conf') 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" -- cgit v1.2.3-54-g00ecf