summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-07 15:26:58 +0100
committerSteve Sakoman <steve@sakoman.com>2021-10-19 04:04:49 -1000
commit771c7fe5fff266038954873290f4c785f66c1634 (patch)
treeb7c60a6c069f54ab8b20f4b56236f4e7c20a241a
parent4efdcc10906945765aa28324ce1badc59cda2976 (diff)
downloadopenembedded-core-771c7fe5fff266038954873290f4c785f66c1634.tar.gz
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: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/conf/multilib.conf2
1 files changed, 2 insertions, 0 deletions
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}"