From 6fdceeab2057612f61755a74097c35d2290945d6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 7 Oct 2021 15:26:58 +0100 Subject: 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] (From OE-Core rev: 64003e5e1b51c0cd561681b1ac13293546b8182b) Signed-off-by: Richard Purdie --- meta/conf/multilib.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 8a8db582df..7f3b9463ef 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}" -- cgit v1.2.3-54-g00ecf