From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 7 Oct 2021 14:26:58 +0000 (+0100)
Subject: multilib: Avoid sysroot race issues when multilib enabled
X-Git-Tag: yocto-3.3.4~41
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7911b903ef57ee8c49c20ac189ec642e124e4134;p=openembedded-core.git

multilib: Avoid sysroot race issues when multilib enabled

Multilib changes RECIPE_SYSROOT which can make the value in PSEUDO_IGNORE_PATHS
incorrect. Add the correct value, which fixes races over files in the sysroot.

[YOCTO #14581]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 64003e5e1b51c0cd561681b1ac13293546b8182b)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index d231107f8b..e9767c73b6 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -11,6 +11,8 @@ STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
 RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
 RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot"
 
+PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot"
+
 INHERIT += "multilib_global"
 
 BBCLASSEXTEND_append = " ${MULTILIBS}"