]> code.ossystems Code Review - openembedded-core.git/commitdiff
multilib: Avoid sysroot race issues when multilib enabled
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 7 Oct 2021 14:26:58 +0000 (15:26 +0100)
committerSteve Sakoman <steve@sakoman.com>
Tue, 19 Oct 2021 14:04:49 +0000 (04:04 -1000)
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>
meta/conf/multilib.conf

index d231107f8b04889fe10a8bd2471eee29b618bb03..e9767c73b60d462f480d9b6f9741b880acdb32b6 100644 (file)
@@ -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}"